]> err.no Git - linux-2.6/commitdiff
[SCSI] include linux/scatterlist.h in scsi_eh.h
authorJames Bottomley <James.Bottomley@steeleye.com>
Tue, 16 Oct 2007 01:07:17 +0000 (21:07 -0400)
committerJames Bottomley <jejb@mulgrave.localdomain>
Thu, 18 Oct 2007 01:53:56 +0000 (21:53 -0400)
Spotted by Paul Jackson <pj@sgi.com>

The error handler rework moved the scatterlist into a globally exposed
structure in scsi_eh.h; unfortunately, the scatterlist include needs
to move from scsi_error.c to scsi_eh.h to allow this to compile
universally.

Acked-by: Paul Jackson <pj@sgi.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/scsi_error.c
include/scsi/scsi_eh.h

index d29f8464b74fadd26de9e5535ede03cfa21d08dd..ebaca4ca4a135787a6ff3fa477a722dbc4b2ec45 100644 (file)
@@ -24,7 +24,6 @@
 #include <linux/interrupt.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
-#include <linux/scatterlist.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
index 44224ba4dd9065cb89d93a10aa1c7daf95b2f6bd..d21b8913ceb3d709f5c711d3b9380f930cc874b9 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef _SCSI_SCSI_EH_H
 #define _SCSI_SCSI_EH_H
 
+#include <linux/scatterlist.h>
+
 #include <scsi/scsi_cmnd.h>
 struct scsi_device;
 struct Scsi_Host;