From 4781a5532f1c7db8583994c7239de34724f3fc1c Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Tue, 8 Mar 2011 21:30:28 -0800
Subject: [PATCH] --- yaml --- r: 254359 b: refs/heads/master c:
 5409bc3a20b239d1b3919db451ee4f6513e64ed1 h: refs/heads/master i:   254357:
 55a69f6305d036d904a3b4c56754a41df07839b6   254355:
 d7f1bfec7f0c39ab8d78830d2e5d5e89cd8a36a9   254351:
 0f2eba067137ac49f3edaa6ecf751e3ffd7215a5 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/scsi/isci/isci.h | 26 +++-----------------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index f708e0a009a5..1c7e08508da5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a38045ba88ed3bee6c57444670fb639c8b61be7
+refs/heads/master: 5409bc3a20b239d1b3919db451ee4f6513e64ed1
diff --git a/trunk/drivers/scsi/isci/isci.h b/trunk/drivers/scsi/isci/isci.h
index 24c67b039d4a..b3f63f1a46cf 100644
--- a/trunk/drivers/scsi/isci/isci.h
+++ b/trunk/drivers/scsi/isci/isci.h
@@ -53,21 +53,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/**
- * This file contains the isci_module object definition.
- *
- * isci.h
- */
-
-#if !defined(_SCI_MODULE_H_)
-#define _SCI_MODULE_H_
-
-/**
- * This file contains the SCI low level driver interface to the SCI and Libsas
- *    Libraries.
- *
- * isci.h
- */
+#ifndef __ISCI_H__
+#define __ISCI_H__
 
 #include <linux/kernel.h>
 #include <linux/list.h>
@@ -136,11 +123,4 @@ enum sci_status isci_parse_user_parameters(
 	int scu_index,
 	struct isci_firmware *fw);
 
-#ifdef ISCI_SLAVE_ALLOC
-extern int ISCI_SLAVE_ALLOC(struct scsi_device *scsi_dev);
-#endif /* ISCI_SLAVE_ALLOC */
-
-#ifdef ISCI_SLAVE_DESTROY
-extern void ISCI_SLAVE_DESTROY(struct scsi_device *scsi_dev);
-#endif  /* ISCI_SLAVE_DESTROY */
-#endif  /* !defined(_SCI_MODULE_H_) */
+#endif  /* __ISCI_H__ */