[x86/486] Enable X86_32_IRIS (IRIS power-off support) (Closes: #619493)

svn path=/dists/sid/linux-2.6/; revision=17112
This commit is contained in:
Ben Hutchings 2011-03-24 15:05:57 +00:00
parent b971b6591e
commit 9dfe1fc259
2 changed files with 2 additions and 0 deletions

1
debian/changelog vendored
View File

@ -10,6 +10,7 @@ linux-2.6 (2.6.38-2) UNRELEASED; urgency=low
* Enable BOOT_PRINTK_DELAY (support for the boot_delay kernel parameter)
* [x86/!486] Enable TRANSPARENT_HUGEPAGE, TRANSPARENT_HUGEPAGE_MADVISE
(Closes: #618924)
* [x86/486] Enable X86_32_IRIS (IRIS power-off support) (Closes: #619493)
[ Jurij Smakov ]
* Bump CONFIG_NR_CPUS on sparc to 256 to accomodate T2+ machines

View File

@ -2,6 +2,7 @@
## file: arch/x86/Kconfig
##
# CONFIG_SMP is not set
CONFIG_X86_32_IRIS=m
CONFIG_X86_UP_APIC=y
CONFIG_X86_UP_IOAPIC=y
# CONFIG_X86_MCE is not set