[kernel] r18564 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Wed Jan 18 14:55:57 2012
New Revision: 18564

Log:
[amd64] cpufreq: Enable X86_P4_CLOCKMOD (Closes: #656328)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Jan 18 05:44:48 2012	(r18563)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Jan 18 14:55:57 2012	(r18564)
@@ -25,6 +25,7 @@
     (Closes: #618422, #648207)
   * [powerpc/powerpc64] udeb: Drop zlib-modules; ZLIB_DEFLATE is built-in
   * [amd64] iommu: Enable INTEL_IOMMU, INTEL_IOMMU_FLOPPY_WA, IRQ_REMAP
+  * [amd64] cpufreq: Enable X86_P4_CLOCKMOD (Closes: #656328)
 
   [ Bastian Blank ]
   * [amd64] crypt: Enable some amd64 only ciphers.

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed Jan 18 05:44:48 2012	(r18563)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed Jan 18 14:55:57 2012	(r18564)
@@ -331,7 +331,7 @@
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_SPEEDSTEP_CENTRINO=m
-# CONFIG_X86_P4_CLOCKMOD is not set
+CONFIG_X86_P4_CLOCKMOD=m
 
 ##
 ## file: drivers/cpuidle/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Wed Jan 18 05:44:48 2012	(r18563)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Wed Jan 18 14:55:57 2012	(r18564)
@@ -124,7 +124,6 @@
 CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
 CONFIG_X86_SPEEDSTEP_ICH=m
 CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
 CONFIG_X86_CPUFREQ_NFORCE2=m
 CONFIG_X86_LONGRUN=m
 CONFIG_X86_LONGHAUL=m