[kernel] r21986 - in dists/sid/linux/debian: . config/i386

[Ben Hutchings]

Author: benh
Date: Fri Oct 31 01:07:35 2014
New Revision: 21986

Log:
[i386/486] Select M586TSC instead of M486

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/i386/config.486

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Fri Oct 31 01:02:06 2014	(r21985)
+++ dists/sid/linux/debian/changelog	Fri Oct 31 01:07:35 2014	(r21986)
@@ -109,8 +109,8 @@
     - [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)

Modified: dists/sid/linux/debian/config/i386/config.486
==============================================================================
--- dists/sid/linux/debian/config/i386/config.486	Fri Oct 31 01:02:06 2014	(r21985)
+++ dists/sid/linux/debian/config/i386/config.486	Fri Oct 31 01:07:35 2014	(r21986)
@@ -18,8 +18,7 @@
 ## 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