[kernel] r17112 - in dists/sid/linux-2.6/debian: . config/i386/none

[Ben Hutchings]

Author: benh
Date: Thu Mar 24 15:05:57 2011
New Revision: 17112

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

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/i386/none/config.486

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Mar 24 14:26:08 2011	(r17111)
+++ dists/sid/linux-2.6/debian/changelog	Thu Mar 24 15:05:57 2011	(r17112)
@@ -10,6 +10,7 @@
   * 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

Modified: dists/sid/linux-2.6/debian/config/i386/none/config.486
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/none/config.486	Thu Mar 24 14:26:08 2011	(r17111)
+++ dists/sid/linux-2.6/debian/config/i386/none/config.486	Thu Mar 24 15:05:57 2011	(r17112)
@@ -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