Merge branches 'pm-cpufreq-sched' and 'pm-opp'
[muen/linux.git] / drivers / base / power / Makefile
index 29cd71d8b360c17e310d672b1127d9793eaf248a..e1bb691cf8f14632ed40cf8d570578bf42616d91 100644 (file)
@@ -2,7 +2,6 @@
 obj-$(CONFIG_PM)       += sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o
 obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o
 obj-$(CONFIG_PM_TRACE_RTC)     += trace.o
-obj-$(CONFIG_PM_OPP)   += opp/
 obj-$(CONFIG_PM_GENERIC_DOMAINS)       +=  domain.o domain_governor.o
 obj-$(CONFIG_HAVE_CLK) += clock_ops.o