From cc39dafda465428a920231b03b8774b0cf9bc8cf Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Fri, 31 Oct 2014 01:07:35 +0000
Subject: [PATCH]  [i386/486] Select M586TSC instead of M486

svn path=/dists/sid/linux/; revision=21986
---
 debian/changelog              | 4 ++--
 debian/config/i386/config.486 | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d12de0989..001a822da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,8 +109,8 @@ linux (3.16.7-1) UNRELEASED; urgency=medium
     - [sparc*] Implement __get_user_pages_fast().
 
   [ Ben Hutchings ]
-  * [i386/486] Update description to say that the processor must have a TSC
-    (see #766105)
+  * [i386/486] Select M586TSC instead of M486, and update description to say
+    that the processor must have a TSC (see #766105)
   * [x86] r8723au: Backport changes up to Linux 3.17 (Closes: #765685)
   * mmc_block: Increase max_devices and set MMC_BLOCK_MINORS to 256
     (Closes: #765621)
diff --git a/debian/config/i386/config.486 b/debian/config/i386/config.486
index 94e3b0722..9b8527684 100644
--- a/debian/config/i386/config.486
+++ b/debian/config/i386/config.486
@@ -18,8 +18,7 @@ CONFIG_OLPC_XO15_SCI=y
 ## file: arch/x86/Kconfig.cpu
 ##
 ## choice: Processor family
-#. TODO: Change to M586TSC at next ABI bump (see #766105)
-CONFIG_M486=y
+CONFIG_M586TSC=y
 # CONFIG_M686 is not set
 ## end choice