[kernel] r17265 - in dists/sid/linux-2.6/debian: . config/mips

[Aurelien Jarno]

Author: aurel32
Date: Thu Apr 28 15:32:47 2011
New Revision: 17265

Log:
* [mips/octeon] Disable CONFIG_HOTPLUG_CPU.

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/mips/config.octeon

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Apr 28 15:06:36 2011	(r17264)
+++ dists/sid/linux-2.6/debian/changelog	Thu Apr 28 15:32:47 2011	(r17265)
@@ -14,6 +14,9 @@
     machines with a lot of FastRAM by reserving some ST-RAM early
   * [m68k] Add patch from mm mailing list to fix SLUB breakage
 
+  [ Aurelien Jarno ]
+  * [mips/octeon] Disable CONFIG_HOTPLUG_CPU.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 25 Apr 2011 02:15:23 +0100
 
 linux-2.6 (2.6.38-4) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/config/mips/config.octeon
==============================================================================
--- dists/sid/linux-2.6/debian/config/mips/config.octeon	Thu Apr 28 15:06:36 2011	(r17264)
+++ dists/sid/linux-2.6/debian/config/mips/config.octeon	Thu Apr 28 15:32:47 2011	(r17265)
@@ -13,6 +13,7 @@
 CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
+# CONFIG_HOTPLUG_CPU is not set
 
 ##
 ## file: arch/mips/cavium-octeon/Kconfig