From patchwork Wed Nov 21 05:44:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Quantal, SRU, 1/1] UBUNTU: [Config] Enable CONFIG_X86_CPUFREQ_NFORCE2=y Date: Tue, 20 Nov 2012 19:44:34 -0000 From: Leann Ogasawara X-Patchwork-Id: 200579 Message-Id: <1045069ff72d4af00d660db6bee56c2488353f64.1353475119.git.leann.ogasawara@canonical.com> To: kernel-team@lists.ubuntu.com From: Leann Ogasawara 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 --- 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