* [mips/octeon] Disabled CONFIG_HOTPLUG_CPU and CONFIG_PM.

svn path=/dists/trunk/linux-2.6/; revision=17303
This commit is contained in:
Aurelien Jarno 2011-05-05 15:05:33 +00:00
parent 4a09e34d41
commit 23ff81e847
2 changed files with 7 additions and 0 deletions

1
debian/changelog vendored
View File

@ -14,6 +14,7 @@ linux-2.6 (2.6.39~rc6-1~experimental.1) UNRELEASED; urgency=low
[ 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@debian.org> Tue, 01 May 2011 14:36:33 +0100

View File

@ -13,6 +13,7 @@ CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
# CONFIG_HOTPLUG_CPU is not set
##
## file: arch/mips/cavium-octeon/Kconfig
@ -120,6 +121,11 @@ CONFIG_EXT2_FS=y
##
CONFIG_EXT3_FS=y
##
## file: kernel/power/Kconfig
##
# CONFIG_PM is not set
##
## file: mm/Kconfig
##