From c65fa3f144dcf8f95968a24cd7785e245c116cde Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@steeleye.com>
Date: Mon, 15 Oct 2007 21:07:17 -0400
Subject: [PATCH] --- yaml --- r: 72312 b: refs/heads/master c:
 645a0c6c48e0122f4212e3957e73bddc18788d99 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/scsi/scsi_error.c | 1 -
 trunk/include/scsi/scsi_eh.h    | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 42e78850833b..63c8181074ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ecd3902c6e16c2445165b872c49e73770b72da7
+refs/heads/master: 645a0c6c48e0122f4212e3957e73bddc18788d99
diff --git a/trunk/drivers/scsi/scsi_error.c b/trunk/drivers/scsi/scsi_error.c
index d29f8464b74f..ebaca4ca4a13 100644
--- a/trunk/drivers/scsi/scsi_error.c
+++ b/trunk/drivers/scsi/scsi_error.c
@@ -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>
diff --git a/trunk/include/scsi/scsi_eh.h b/trunk/include/scsi/scsi_eh.h
index 44224ba4dd90..d21b8913ceb3 100644
--- a/trunk/include/scsi/scsi_eh.h
+++ b/trunk/include/scsi/scsi_eh.h
@@ -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;