diff options
| author | Stephen Cameron <steve.cameron@hp.com> | 2007-05-08 03:30:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:10 -0400 |
| commit | d5d3b736e3264934ec832a657a9a434b65f3d51f (patch) | |
| tree | 287a728cd687e07d064150500c4679f7347760c6 | |
| parent | c9919380187e8182ac449652094c345c82dce0c3 (diff) | |
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>
| -rw-r--r-- | drivers/block/cciss.c | 1 | ||||
| -rw-r--r-- | drivers/block/cciss_scsi.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 4ec3e75ba474..370dfe1c422e 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #include <linux/blkdev.h> | 45 | #include <linux/blkdev.h> |
| 46 | #include <linux/genhd.h> | 46 | #include <linux/genhd.h> |
| 47 | #include <linux/completion.h> | 47 | #include <linux/completion.h> |
| 48 | #include <scsi/scsi.h> | ||
| 48 | #include <scsi/sg.h> | 49 | #include <scsi/sg.h> |
| 49 | #include <scsi/scsi_ioctl.h> | 50 | #include <scsi/scsi_ioctl.h> |
| 50 | #include <linux/cdrom.h> | 51 | #include <linux/cdrom.h> |
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c index bb15051ffbe0..90961a8ea895 100644 --- a/drivers/block/cciss_scsi.c +++ b/drivers/block/cciss_scsi.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | 35 | ||
| 36 | #include <asm/atomic.h> | 36 | #include <asm/atomic.h> |
| 37 | 37 | ||
| 38 | #include <scsi/scsi.h> | ||
| 39 | #include <scsi/scsi_cmnd.h> | 38 | #include <scsi/scsi_cmnd.h> |
| 40 | #include <scsi/scsi_device.h> | 39 | #include <scsi/scsi_device.h> |
| 41 | #include <scsi/scsi_host.h> | 40 | #include <scsi/scsi_host.h> |