[Quantal][SRU][PATCH 1/1] UBUNTU: [Config] Enable CONFIG_X86_CPUFREQ_NFORCE2=y

[leann.ogasawara at canonical.com]

From: Leann Ogasawara <leann.ogasawara at canonical.com>

BugLink: http://bugs.launchpad.net/bugs/1079900

cpufreq-nforce2 is not autoloadable.  We built this in for past releases
(eg Precise 12.04).  Reinstate this as built in vs enabled as a module.

Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
---
 debian.master/abi/3.5.0-19.30/i386/generic.modules |    1 -
 debian.master/config/config.common.ubuntu          |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian.master/abi/3.5.0-19.30/i386/generic.modules b/debian.master/abi/3.5.0-19.30/i386/generic.modules
index d267dda..0cf7f63 100644
--- a/debian.master/abi/3.5.0-19.30/i386/generic.modules
+++ b/debian.master/abi/3.5.0-19.30/i386/generic.modules
@@ -550,7 +550,6 @@ cpia2
 cpqarray
 cpqphp
 cpu5wdt
-cpufreq-nforce2
 cpuid
 cpu-notifier-error-inject
 c-qcam
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 6517159..14a98ae 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6366,7 +6366,7 @@ CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_CMOV=y
 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CPUFREQ_NFORCE2=m
+CONFIG_X86_CPUFREQ_NFORCE2=y
 CONFIG_X86_CPUID=m
 CONFIG_X86_DEBUGCTLMSR=y
 # CONFIG_X86_DECODER_SELFTEST is not set
-- 
1.7.9.5