From 6a2cce672623d435355d4deccc6e307a37c8dd79 Mon Sep 17 00:00:00 2001
From: Holger Macht <holger@homac.de>
Date: Mon, 25 Jun 2012 16:13:02 +0800
Subject: [PATCH] --- yaml --- r: 311462 b: refs/heads/master c:
 de50ada55b6b83b54b817911ec42dc590e1c1738 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/scsi/scsi_lib.c | 17 +++++++++++++++++
 trunk/include/scsi/scsi.h     | 10 ++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f8a445da523d..854f17492882 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9acc7bde23ebb19a704395f76490685e1513e422
+refs/heads/master: de50ada55b6b83b54b817911ec42dc590e1c1738
diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c
index 6dfb9785d345..08f1e297c735 100644
--- a/trunk/drivers/scsi/scsi_lib.c
+++ b/trunk/drivers/scsi/scsi_lib.c
@@ -68,6 +68,23 @@ static struct scsi_host_sg_pool scsi_sg_pools[] = {
 
 struct kmem_cache *scsi_sdb_cache;
 
+#ifdef CONFIG_ACPI
+#include <acpi/acpi_bus.h>
+
+int scsi_register_acpi_bus_type(struct acpi_bus_type *bus)
+{
+        bus->bus = &scsi_bus_type;
+        return register_acpi_bus_type(bus);
+}
+EXPORT_SYMBOL_GPL(scsi_register_acpi_bus_type);
+
+void scsi_unregister_acpi_bus_type(struct acpi_bus_type *bus)
+{
+	unregister_acpi_bus_type(bus);
+}
+EXPORT_SYMBOL_GPL(scsi_unregister_acpi_bus_type);
+#endif
+
 /*
  * When to reinvoke queueing after a resource shortage. It's 3 msecs to
  * not change behaviour from the previous unplug mechanism, experimentation
diff --git a/trunk/include/scsi/scsi.h b/trunk/include/scsi/scsi.h
index f34a5a87af38..4527b3a13321 100644
--- a/trunk/include/scsi/scsi.h
+++ b/trunk/include/scsi/scsi.h
@@ -214,6 +214,16 @@ scsi_command_size(const unsigned char *cmnd)
 		scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]);
 }
 
+#ifdef CONFIG_ACPI
+struct acpi_bus_type;
+
+extern int
+scsi_register_acpi_bus_type(struct acpi_bus_type *bus);
+
+extern void
+scsi_unregister_acpi_bus_type(struct acpi_bus_type *bus);
+#endif
+
 /*
  *  SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
  *  T10/1561-D Revision 4 Draft dated 7th November 2002.