aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/Makefile2
-rw-r--r--drivers/scsi/scsi_priv.h2
-rw-r--r--drivers/scsi/scsi_sysfs.c2
3 files changed, 3 insertions, 3 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
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index b4056d14f812..342ee1a9c41d 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -146,7 +146,7 @@ static inline void scsi_netlink_exit(void) {}
146#endif 146#endif
147 147
148/* scsi_pm.c */ 148/* scsi_pm.c */
149#ifdef CONFIG_PM_OPS 149#ifdef CONFIG_PM
150extern const struct dev_pm_ops scsi_bus_pm_ops; 150extern const struct dev_pm_ops scsi_bus_pm_ops;
151#endif 151#endif
152#ifdef CONFIG_PM_RUNTIME 152#ifdef CONFIG_PM_RUNTIME
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 490ce213204e..e44ff64233fd 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -383,7 +383,7 @@ struct bus_type scsi_bus_type = {
383 .name = "scsi", 383 .name = "scsi",
384 .match = scsi_bus_match, 384 .match = scsi_bus_match,
385 .uevent = scsi_bus_uevent, 385 .uevent = scsi_bus_uevent,
386#ifdef CONFIG_PM_OPS 386#ifdef CONFIG_PM
387 .pm = &scsi_bus_pm_ops, 387 .pm = &scsi_bus_pm_ops,
388#endif 388#endif
389}; 389};