diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-02 02:54:37 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-02 02:54:37 +0300 |
| commit | 394f7164e65a734f815543d918c7bdc0587593a6 (patch) | |
| tree | 19e57816a0c95a67e5f8cd20276673bc69df0556 /drivers/cpufreq/Makefile | |
| parent | dcf3d0183f100a14f60eb5993e124a4a1322ee9a (diff) | |
| parent | a6eed752f5fb40990eb28fddb2b93258fb7e3be0 (diff) | |
| download | linux-394f7164e65a734f815543d918c7bdc0587593a6.tar.xz | |
Merge branch 'pm-opp'
* pm-opp:
PM / OPP: passing NULL to PTR_ERR()
PM / OPP: Move cpu specific code to opp/cpu.c
PM / OPP: Move opp core to its own directory
PM / OPP: Prefix exported opp routines with dev_pm_opp_
PM / OPP: Rename opp init/free table routines
PM / OPP: reuse of_parse_phandle()
Diffstat (limited to 'drivers/cpufreq/Makefile')
| -rw-r--r-- | drivers/cpufreq/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index 47a7ebbcf998..d11309c487d0 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -1,6 +1,5 @@ # CPUfreq core obj-$(CONFIG_CPU_FREQ) += cpufreq.o freq_table.o -obj-$(CONFIG_PM_OPP) += cpufreq_opp.o # CPUfreq stats obj-$(CONFIG_CPU_FREQ_STAT) += cpufreq_stats.o |