cciss: include scsi/scsi.h unconditionally
authorStephen Cameron <steve.cameron@hp.com>
Tue, 8 May 2007 07:30:02 +0000 (00:30 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 8 May 2007 18:15:10 +0000 (11:15 -0700)
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>
drivers/block/cciss.c
drivers/block/cciss_scsi.c

index 4ec3e75ba4742ebae0e7c35b1a0241a1278281fb..370dfe1c422ea8a4b3ce6c8c9ba49f8001667cd3 100644 (file)
@@ -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>
index bb15051ffbe0d316182cbb9ef11d9dba9b8f64c0..90961a8ea8953f4b44c4aafeac544a7421d4c437 100644 (file)
@@ -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>