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.36.4~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a00ffdc0858005a186f5404a882546557cb5114;p=thirdparty%2Fkernel%2Fstable.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 8fcb6e0e9e720..d38b58e735dcd 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;