Patchwork [1/5] scsi: Export scsi_bus_type

login
register
mail settings
Submitter Matthew Garrett
Date Sept. 15, 2010, 7:57 p.m.
Message ID <1284580683-2386-1-git-send-email-mjg@redhat.com>
Download mbox | patch
Permalink /patch/64895/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Matthew Garrett - Sept. 15, 2010, 7:57 p.m.
We need scsi_bus_type in order to be able to bind ata devices against acpi
devices. Export it from the scsi core.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
---
 drivers/scsi/scsi_priv.h |    1 -
 include/scsi/scsi.h      |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)

Patch

diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index b4056d1..ff1e284 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -132,7 +132,6 @@  extern int scsi_sysfs_target_initialize(struct scsi_device *);
 extern struct scsi_transport_template blank_transport_template;
 extern void __scsi_remove_device(struct scsi_device *);
 
-extern struct bus_type scsi_bus_type;
 extern const struct attribute_group *scsi_sysfs_shost_attr_groups[];
 
 /* scsi_netlink.c */
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 8fcb6e0..6eb0c90 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -149,6 +149,8 @@  struct scsi_cmnd;
 
 #define SCSI_MAX_VARLEN_CDB_SIZE 260
 
+extern struct bus_type scsi_bus_type;
+
 /* defined in T10 SCSI Primary Commands-2 (SPC2) */
 struct scsi_varlen_cdb_hdr {
 	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */