diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-26 12:13:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-26 12:13:33 -0700 |
| commit | 733be82e7d41b9f932118f021704b5289d527231 (patch) | |
| tree | b2c78fe1436001a153f9fd1883e679916f79af43 /arch/x86/kernel/cpu/cpufreq/powernow-k7.c | |
| parent | 564346224daaa8f7222d7a92cdbb7bafde59ae6e (diff) | |
| parent | ca446d06351992e4f1a7c1e5e99870ab4ec5188f (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] powernow-k8: determine exact CPU frequency for HW Pstates
[CPUFREQ] powernow-k8 cleanup msg if BIOS does not export ACPI _PSS cpufreq data
[CPUFREQ] fix timer teardown in ondemand governor
[CPUFREQ] fix timer teardown in conservative governor
[CPUFREQ] remove rwsem lock from CPUFREQ_GOV_STOP call
[CPUFREQ] powernow-k7 build fix when ACPI=n
[CPUFREQ] add atom family to p4-clockmod
Diffstat (limited to 'arch/x86/kernel/cpu/cpufreq/powernow-k7.c')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k7.c b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c index 3c28ccd4974..a8363e5be4e 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k7.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c @@ -168,10 +168,12 @@ static int check_powernow(void) return 1; } +#ifdef CONFIG_X86_POWERNOW_K7_ACPI static void invalidate_entry(unsigned int entry) { powernow_table[entry].frequency = CPUFREQ_ENTRY_INVALID; } +#endif static int get_ranges(unsigned char *pst) { |