diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-09 23:43:53 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-09 23:43:53 +0100 |
commit | c488ea461359483976ff7d4838cce5c0138c6b3e (patch) | |
tree | 3bee2239b14a33c4519db8e7ca673dea37185a68 /drivers/cpufreq/Makefile | |
parent | intel_pstate: provide option to only use intel_pstate with HWP (diff) | |
parent | cpufreq: Add SFI based cpufreq driver support (diff) | |
download | linux-c488ea461359483976ff7d4838cce5c0138c6b3e.tar.xz linux-c488ea461359483976ff7d4838cce5c0138c6b3e.zip |
Merge branch 'sfi' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux into pm-cpufreq
Pull SFI-based cpufreq driver for v3.20 from Len Brown.
* 'sfi' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
cpufreq: Add SFI based cpufreq driver support
SFI: fix compiler warnings
Diffstat (limited to 'drivers/cpufreq/Makefile')
-rw-r--r-- | drivers/cpufreq/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index b3ca7b0b2c33..8b4220ac888b 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -41,6 +41,7 @@ obj-$(CONFIG_X86_P4_CLOCKMOD) += p4-clockmod.o obj-$(CONFIG_X86_CPUFREQ_NFORCE2) += cpufreq-nforce2.o obj-$(CONFIG_X86_INTEL_PSTATE) += intel_pstate.o obj-$(CONFIG_X86_AMD_FREQ_SENSITIVITY) += amd_freq_sensitivity.o +obj-$(CONFIG_X86_SFI_CPUFREQ) += sfi-cpufreq.o ################################################################################## # ARM SoC drivers |