From c7bfae16cde68b056830a6b7ef160d8247e2dcda Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Tue, 25 Oct 2011 09:43:23 +0000
Subject: [PATCH] [x86/!486] Enable INTEL_IDLE

svn path=/dists/trunk/linux-2.6/; revision=18179
---
 debian/changelog                    | 1 +
 debian/config/i386/none/config.486  | 5 +++++
 debian/config/kernelarch-x86/config | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0c4ac8294..3c12fb9ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ linux-2.6 (3.1.0-1~experimental.1) UNRELEASED; urgency=low
   [ Ben Hutchings ]
   * [powerpc/powerpc64] Add missing #include to LPAR console selection fix
   * Make kernel-wedge package checks non-fatal in experimental builds
+  * [x86/!486] Enable INTEL_IDLE
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 27 Sep 2011 06:02:56 +0100
 
diff --git a/debian/config/i386/none/config.486 b/debian/config/i386/none/config.486
index 3f6218ef3..ffd7ea217 100644
--- a/debian/config/i386/none/config.486
+++ b/debian/config/i386/none/config.486
@@ -37,6 +37,11 @@ CONFIG_EISA_NAMES=y
 CONFIG_I2C_ELEKTOR=m
 CONFIG_I2C_STUB=m
 
+##
+## file: drivers/idle/Kconfig
+##
+# CONFIG_INTEL_IDLE is not set
+
 ##
 ## file: drivers/input/mouse/Kconfig
 ##
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index fe55e2b3b..d4ddb26b5 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -548,7 +548,7 @@ CONFIG_BLK_DEV_TRM290=m
 ##
 ## file: drivers/idle/Kconfig
 ##
-# CONFIG_INTEL_IDLE is not set
+CONFIG_INTEL_IDLE=y
 
 ##
 ## file: drivers/input/gameport/Kconfig