From dce8a9a738d7a48573dc262ec9fb4547cb6e4f9f Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 18 Jan 2012 15:00:04 +0000 Subject: [PATCH] Clean up x86 cpufreq config We have CONFIG_X86_POWERNOW_K8=m and CONFIG_SPEEDSTEP_CENTRINO=m for both 32-bit and 64-bit configurations, so set these only in the main config file. svn path=/dists/trunk/linux-2.6/; revision=18565 --- debian/config/kernelarch-x86/config | 1 + debian/config/kernelarch-x86/config-arch-32 | 2 -- debian/config/kernelarch-x86/config-arch-64 | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index bfa4bc553..d53a68a7c 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -330,6 +330,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y ## CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K8=m CONFIG_X86_SPEEDSTEP_CENTRINO=m CONFIG_X86_P4_CLOCKMOD=m diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32 index 4bf0a5381..b296c0a33 100644 --- a/debian/config/kernelarch-x86/config-arch-32 +++ b/debian/config/kernelarch-x86/config-arch-32 @@ -118,9 +118,7 @@ CONFIG_AGP_EFFICEON=y ## CONFIG_X86_POWERNOW_K6=m CONFIG_X86_POWERNOW_K7=m -CONFIG_X86_POWERNOW_K8=m CONFIG_X86_GX_SUSPMOD=m -CONFIG_X86_SPEEDSTEP_CENTRINO=m CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y CONFIG_X86_SPEEDSTEP_ICH=m CONFIG_X86_SPEEDSTEP_SMI=m diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index 985f7fa9d..63c22f53d 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -47,11 +47,6 @@ CONFIG_AGP=y #. Needed by GART_IOMMU CONFIG_AGP_AMD64=y -## -## file: drivers/cpufreq/Kconfig.x86 -## -CONFIG_X86_POWERNOW_K8=m - ## ## file: drivers/i2c/busses/Kconfig ##