Make cciss unconditionally include scsi/scsi.h From: Stephen M. Cameron <steve.cameron@xxxxxx> Signed-off-by: Stephen M. Cameron <steve.cameron@xxxxxx> --- drivers/block/cciss.c | 1 + drivers/block/cciss_scsi.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/block/cciss.c~include_scsi_h_unconditionally drivers/block/cciss.c --- linux-2.6.21-rc6/drivers/block/cciss.c~include_scsi_h_unconditionally 2007-04-13 08:23:07.000000000 -0500 +++ linux-2.6.21-rc6-scameron/drivers/block/cciss.c 2007-04-13 08:25:05.000000000 -0500 @@ -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~include_scsi_h_unconditionally drivers/block/cciss_scsi.c --- linux-2.6.21-rc6/drivers/block/cciss_scsi.c~include_scsi_h_unconditionally 2007-04-13 08:23:53.000000000 -0500 +++ linux-2.6.21-rc6-scameron/drivers/block/cciss_scsi.c 2007-04-13 08:24:34.000000000 -0500 @@ -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> _ - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html