From: David Dillow <dillowda@ornl.gov>
Date: Sun, 16 Jan 2011 20:12:39 +0000 (-0500)
Subject: fix incorrect value of SCSI_MAX_SG_CHAIN_SEGMENTS due to include file ordering
X-Git-Tag: v2.6.37.1~201
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8d0cf973a6813b48d950d4e82e6b063dc6f912a4;p=users%2Fdwmw2%2Flinux.git

fix incorrect value of SCSI_MAX_SG_CHAIN_SEGMENTS due to include file ordering

commit ac61c46f4f7665ab4548e90430c37b2529e16cff upstream.

If the compiled object doesn't include linux/scatterlist.h before
scsi/scsi.h, it will get an incorrect definition of
SCSI_MAX_SG_CHAIN_SEGMENTS.

Signed-off-by: David Dillow <dillowda@ornl.gov>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 216af8538cc93..1933e3c8d205b 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -9,6 +9,7 @@
 #define _SCSI_SCSI_H
 
 #include <linux/types.h>
+#include <linux/scatterlist.h>
 
 struct scsi_cmnd;