diff --git a/[refs] b/[refs]
index 55625e9b9053..df499cc4acc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0387f4511e05a5cba8570e47cd1c7b7cc7875787
+refs/heads/master: 06b4f2a51c02ad6190b569b67ac493659d9df68c
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
index b84d5050e92e..ffcbbba806e0 100644
--- a/trunk/arch/i386/Kconfig
+++ b/trunk/arch/i386/Kconfig
@@ -1080,7 +1080,7 @@ config APM_REAL_MODE_POWER_OFF
 
 endif # APM
 
-source "arch/x86/kernel/cpu/cpufreq/Kconfig"
+source "arch/x86/kernel/cpu/cpufreq/Kconfig_32"
 
 endmenu
 
diff --git a/trunk/arch/x86/kernel/cpu/cpufreq/Kconfig b/trunk/arch/x86/kernel/cpu/cpufreq/Kconfig_32
similarity index 100%
rename from trunk/arch/x86/kernel/cpu/cpufreq/Kconfig
rename to trunk/arch/x86/kernel/cpu/cpufreq/Kconfig_32
diff --git a/trunk/arch/x86/kernel/cpufreq/Kconfig b/trunk/arch/x86/kernel/cpu/cpufreq/Kconfig_64
similarity index 97%
rename from trunk/arch/x86/kernel/cpufreq/Kconfig
rename to trunk/arch/x86/kernel/cpu/cpufreq/Kconfig_64
index a3fd51926cbd..9c9699fdcf52 100644
--- a/trunk/arch/x86/kernel/cpufreq/Kconfig
+++ b/trunk/arch/x86/kernel/cpu/cpufreq/Kconfig_64
@@ -19,7 +19,7 @@ config X86_POWERNOW_K8
 	  To compile this driver as a module, choose M here: the
 	  module will be called powernow-k8.
 
-	  For details, take a look at <file:Documentation/cpu-freq/>. 
+	  For details, take a look at <file:Documentation/cpu-freq/>.
 
 	  If in doubt, say N.
 
diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig
index 78cb68f2ebbd..712ebd9c5d6a 100644
--- a/trunk/arch/x86_64/Kconfig
+++ b/trunk/arch/x86_64/Kconfig
@@ -723,7 +723,7 @@ config ARCH_HIBERNATION_HEADER
 
 source "drivers/acpi/Kconfig"
 
-source "arch/x86/kernel/cpufreq/Kconfig"
+source "arch/x86/kernel/cpu/cpufreq/Kconfig_64"
 
 endmenu