From: Stephen Cameron <steve.cameron@hp.com>

Make cciss unconditionally include scsi/scsi.h

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

 drivers/block/cciss.c      |    1 +
 drivers/block/cciss_scsi.c |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/block/cciss.c~cciss-include-scsi-scsih-unconditionally drivers/block/cciss.c
--- a/drivers/block/cciss.c~cciss-include-scsi-scsih-unconditionally
+++ a/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 -puN drivers/block/cciss_scsi.c~cciss-include-scsi-scsih-unconditionally drivers/block/cciss_scsi.c
--- a/drivers/block/cciss_scsi.c~cciss-include-scsi-scsih-unconditionally
+++ a/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> 
_