diff --git a/[refs] b/[refs]
index 8b08ceeccdf3..316a67d964e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad28a07bcadc5945f7a90d9de3a196825e69d9d3
+refs/heads/master: 231bc2a222411f43bfb0fbb6d64c0f34c7b1039f
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 55bd35c0f082..9c9627e8e334 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -50,6 +50,7 @@
 #include <scsi/sg.h>
 #include <scsi/scsi_ioctl.h>
 #include <linux/cdrom.h>
+#include <linux/scatterlist.h>
 
 #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
 #define DRIVER_NAME "HP CISS Driver (v 3.6.14)"