aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/Makefile
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-02-10 18:06:54 -0500
committerRafael J. Wysocki <rjw@sisk.pl>2011-03-14 19:43:15 -0400
commitaa33860158114d0df3c7997bc1dd41c0168e1c2a (patch)
treea1ae98c42232835780618b0a5dea78c5478ed58c /drivers/scsi/Makefile
parent196ec243224bb38fc5c41d9fa4050f70708b7fb4 (diff)
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/scsi/Makefile')
-rw-r--r--drivers/scsi/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 2e9a87e8e7d8..ef6de669424b 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -165,7 +165,7 @@ scsi_mod-$(CONFIG_SCSI_NETLINK) += scsi_netlink.o
165scsi_mod-$(CONFIG_SYSCTL) += scsi_sysctl.o 165scsi_mod-$(CONFIG_SYSCTL) += scsi_sysctl.o
166scsi_mod-$(CONFIG_SCSI_PROC_FS) += scsi_proc.o 166scsi_mod-$(CONFIG_SCSI_PROC_FS) += scsi_proc.o
167scsi_mod-y += scsi_trace.o 167scsi_mod-y += scsi_trace.o
168scsi_mod-$(CONFIG_PM_OPS) += scsi_pm.o 168scsi_mod-$(CONFIG_PM) += scsi_pm.o
169 169
170scsi_tgt-y += scsi_tgt_lib.o scsi_tgt_if.o 170scsi_tgt-y += scsi_tgt_lib.o scsi_tgt_if.o
171 171