aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-02-11 00:06:54 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2011-03-15 00:43:15 +0100
commitaa33860158114d0df3c7997bc1dd41c0168e1c2a (patch)
treea1ae98c42232835780618b0a5dea78c5478ed58c /drivers/base
parent196ec243224bb38fc5c41d9fa4050f70708b7fb4 (diff)
downloadkernel_samsung_smdk4412-aa33860158114d0df3c7997bc1dd41c0168e1c2a.zip
kernel_samsung_smdk4412-aa33860158114d0df3c7997bc1dd41c0168e1c2a.tar.gz
kernel_samsung_smdk4412-aa33860158114d0df3c7997bc1dd41c0168e1c2a.tar.bz2
PM: Remove CONFIG_PM_OPS
After redefining CONFIG_PM to depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME) the CONFIG_PM_OPS option is redundant and can be replaced with CONFIG_PM. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile
index abe46ed..118c1b9 100644
--- a/drivers/base/power/Makefile
+++ b/drivers/base/power/Makefile
@@ -1,7 +1,6 @@
-obj-$(CONFIG_PM) += sysfs.o
+obj-$(CONFIG_PM) += sysfs.o generic_ops.o
obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o
obj-$(CONFIG_PM_RUNTIME) += runtime.o
-obj-$(CONFIG_PM_OPS) += generic_ops.o
obj-$(CONFIG_PM_TRACE_RTC) += trace.o
obj-$(CONFIG_PM_OPP) += opp.o