Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...

[~andy/linux] / drivers / cpufreq / powernow-k7.c

diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
index 501d167368d2f22636d460ee7cf9f6b5973276c1..334cc2f1e9f1fe1a675b7d9eadf9819fbedadfce 100644 (file)
--- a/drivers/cpufreq/powernow-k7.c
+++ b/drivers/cpufreq/powernow-k7.c
@@ -27,7 +27,6 @@
 
 #include <asm/timer.h>         /* Needed for recalibrate_cpu_khz() */
 #include <asm/msr.h>
-#include <asm/system.h>
 #include <asm/cpu_device_id.h>
 
 #ifdef CONFIG_X86_POWERNOW_K7_ACPI
@@ -112,7 +111,7 @@ static int check_fsb(unsigned int fsbspeed)
 }
 
 static const struct x86_cpu_id powernow_k7_cpuids[] = {
-       { X86_VENDOR_AMD, 7, },
+       { X86_VENDOR_AMD, 6, },
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, powernow_k7_cpuids);