From 9dfe1fc259e03c1b168f9e7951f651b0ca17394e Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 24 Mar 2011 15:05:57 +0000 Subject: [PATCH] [x86/486] Enable X86_32_IRIS (IRIS power-off support) (Closes: #619493) svn path=/dists/sid/linux-2.6/; revision=17112 --- debian/changelog | 1 + debian/config/i386/none/config.486 | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index ab53f5ba1..999bfe869 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/debian/config/i386/none/config.486 b/debian/config/i386/none/config.486 index 0259740f0..1e9109630 100644 --- a/debian/config/i386/none/config.486 +++ b/debian/config/i386/none/config.486 @@ -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