From: Stephen Cameron <steve.cameron@hp.com>
Date: Tue, 8 May 2007 07:30:02 +0000 (-0700)
Subject: cciss: include scsi/scsi.h unconditionally
X-Git-Tag: v2.6.22-rc1~653
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d5d3b736e3264934ec832a657a9a434b65f3d51f;p=~shefty%2Frdma-dev.git

cciss: include scsi/scsi.h unconditionally

Make cciss unconditionally include scsi/scsi.h, because of the use of
SCSI_IOCTL_GET_IDLUN and SCSI_IOCTL_GET_BUS_NUMBER.

Signed-off-by: Stephen M. Cameron <steve.cameron@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 4ec3e75ba47..370dfe1c422 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -45,6 +45,7 @@
 #include <linux/blkdev.h>
 #include <linux/genhd.h>
 #include <linux/completion.h>
+#include <scsi/scsi.h>
 #include <scsi/sg.h>
 #include <scsi/scsi_ioctl.h>
 #include <linux/cdrom.h>
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index bb15051ffbe..90961a8ea89 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -35,7 +35,6 @@
 
 #include <asm/atomic.h>
 
-#include <scsi/scsi.h> 
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>