diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 12:52:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 12:52:38 -0800 |
| commit | 08b8499bdd26822df16f962db88215d02e40850a (patch) | |
| tree | 3a88a0f1a425637d0f5a8e68ec3419fc5f1bdb9b /arch/x86/kernel/cpu/cpufreq/Makefile | |
| parent | 3ceb85ae35421c5bc560c7af8d0dd1c73d071ad0 (diff) | |
| parent | fb4635932a4e19c2f55383f968a0e9b64da37354 (diff) | |
| download | blackbird-op-linux-08b8499bdd26822df16f962db88215d02e40850a.tar.gz blackbird-op-linux-08b8499bdd26822df16f962db88215d02e40850a.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] Fix cast warning in pcc driver.
[CPUFREQ] Processor Clocking Control interface driver
Diffstat (limited to 'arch/x86/kernel/cpu/cpufreq/Makefile')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/Makefile b/arch/x86/kernel/cpu/cpufreq/Makefile index 509296df294d..1840c0a5170b 100644 --- a/arch/x86/kernel/cpu/cpufreq/Makefile +++ b/arch/x86/kernel/cpu/cpufreq/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o obj-$(CONFIG_X86_ACPI_CPUFREQ) += acpi-cpufreq.o +obj-$(CONFIG_X86_PCC_CPUFREQ) += pcc-cpufreq.o obj-$(CONFIG_X86_POWERNOW_K6) += powernow-k6.o obj-$(CONFIG_X86_POWERNOW_K7) += powernow-k7.o obj-$(CONFIG_X86_LONGHAUL) += longhaul.o |
