[kernel] r17303 - in dists/trunk/linux-2.6/debian: . config/mips

[Aurelien Jarno]

Author: aurel32
Date: Thu May  5 15:05:33 2011
New Revision: 17303

Log:
* [mips/octeon] Disabled CONFIG_HOTPLUG_CPU and CONFIG_PM.

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu May  5 14:53:48 2011	(r17302)
+++ dists/trunk/linux-2.6/debian/changelog	Thu May  5 15:05:33 2011	(r17303)
@@ -14,6 +14,7 @@
   [ Aurelien Jarno ]
   * drm/nouveau, drm/radeon: remove fix for non-powerpc/sparc/x86.
   * [mips,mipsel] Disabled CONFIG_DRM_NOUVEAU and CONFIG_DRM_RADEON_KMS.
+  * [mips/octeon] Disabled CONFIG_HOTPLUG_CPU and CONFIG_PM.
 
  -- maximilian attems <maks at debian.org>  Tue, 01 May 2011 14:36:33 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.octeon
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.octeon	Thu May  5 14:53:48 2011	(r17302)
+++ dists/trunk/linux-2.6/debian/config/mips/config.octeon	Thu May  5 15:05:33 2011	(r17303)
@@ -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
@@ -121,6 +122,11 @@
 CONFIG_EXT3_FS=y
 
 ##
+## file: kernel/power/Kconfig
+##
+# CONFIG_PM is not set
+
+##
 ## file: mm/Kconfig
 ##
 ## choice: Memory model