[kernel/f14/master] build intel_idle into the kernel

[Kyle McMartin]

commit 2fe1e8e3975ea23d4e3bf447a09758beae68853e
Author: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
Date:   Mon Oct 4 16:13:30 2010 -0400

    build intel_idle into the kernel

 config-x86-generic    |    2 +-
 config-x86_64-generic |    2 +-
 kernel.spec           |    5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/config-x86-generic b/config-x86-generic
index 6469064..f1686da 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -489,6 +489,6 @@ CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_LPC_SCH=m
 
-CONFIG_INTEL_IDLE=m
+CONFIG_INTEL_IDLE=y
 
 CONFIG_PCI_CNB20LE_QUIRK=y
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 5fb5f1b..650aed3 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -403,7 +403,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_LPC_SCH=m
 
-CONFIG_INTEL_IDLE=m
+CONFIG_INTEL_IDLE=y
 CONFIG_I7300_IDLE=m
 
 CONFIG_PCI_CNB20LE_QUIRK=y
diff --git a/kernel.spec b/kernel.spec
index 2f8b502..a867f7e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1976,6 +1976,11 @@ fi
 
 %changelog
 * Mon Oct 04 2010 Kyle McMartin <kyle at redhat.com>
+- Build intel_idle into the kernel, so they get loaded by default. In
+  later kernels, it is no longer modular, so it isn't an issue. Noticed
+  by mjg59.
+
+* Mon Oct 04 2010 Kyle McMartin <kyle at redhat.com>
 - Make printk.time=1 the default, use printk.time=0 to turn it off.
   Results in much more useful traces for us, which is a big win.