Merge branch 'linus' into x86/irqstats

[pandora-kernel.git] / arch / x86 / kernel / cpu / cpufreq / powernow-k7.c

diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k7.c b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
index f3686a5..0a61159 100644 (file)
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
@@ -114,7 +114,7 @@ static int check_fsb(unsigned int fsbspeed)
 
 static int check_powernow(void)
 {
-       struct cpuinfo_x86 *c = cpu_data;
+       struct cpuinfo_x86 *c = &cpu_data(0);
        unsigned int maxei, eax, ebx, ecx, edx;
 
        if ((c->x86_vendor != X86_VENDOR_AMD) || (c->x86 !=6)) {
@@ -460,7 +460,7 @@ static int powernow_decode_bios (int maxfid, int startvid)
 
                        latency = psb->settlingtime;
                        if (latency < 100) {
-                               printk (KERN_INFO PFX "BIOS set settling time to %d microseconds."
+                               printk(KERN_INFO PFX "BIOS set settling time to %d microseconds. "
                                                "Should be at least 100. Correcting.\n", latency);
                                latency = 100;
                        }