From 045ffdcd255c8f721b37855f1126e0e5dd5ff58d Mon Sep 17 00:00:00 2001
From: Stephen Cameron <steve.cameron@hp.com>
Date: Tue, 8 May 2007 00:30:02 -0700
Subject: [PATCH] --- yaml --- r: 54683 b: refs/heads/master c:
 d5d3b736e3264934ec832a657a9a434b65f3d51f h: refs/heads/master i:   54681:
 adc9481d7f15a4250c880f681c85828da5334b3a   54679:
 d372989ca0717d79f9d582b37d613355d8cea76e v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/cciss.c      | 1 +
 trunk/drivers/block/cciss_scsi.c | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 58d950e337e6..62a9eea84594 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9919380187e8182ac449652094c345c82dce0c3
+refs/heads/master: d5d3b736e3264934ec832a657a9a434b65f3d51f
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 4ec3e75ba474..370dfe1c422e 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/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/trunk/drivers/block/cciss_scsi.c b/trunk/drivers/block/cciss_scsi.c
index bb15051ffbe0..90961a8ea895 100644
--- a/trunk/drivers/block/cciss_scsi.c
+++ b/trunk/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>