Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux

[mirror_ubuntu-artful-kernel.git] / drivers / scsi / Makefile

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index b57c532561639c036ec6aaed43b48a93dfca7563..7ad0b8a79ae8dac6245d6b555ad7ebd2ebd39173 100644 (file)
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -166,7 +166,7 @@ scsi_mod-$(CONFIG_SCSI_NETLINK)     += scsi_netlink.o
 scsi_mod-$(CONFIG_SYSCTL)      += scsi_sysctl.o
 scsi_mod-$(CONFIG_SCSI_PROC_FS)        += scsi_proc.o
 scsi_mod-y                     += scsi_trace.o
-scsi_mod-$(CONFIG_PM_OPS)      += scsi_pm.o
+scsi_mod-$(CONFIG_PM)          += scsi_pm.o
 
 scsi_tgt-y                     += scsi_tgt_lib.o scsi_tgt_if.o