From 32d5d138d381805ff030ae33aa63be5e28d575f5 Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@suse.de>
Date: Wed, 3 Mar 2010 11:06:56 +0530
Subject: [PATCH] --- yaml --- r: 188319 b: refs/heads/master c:
 fac829fdcaf451a20106cbc468ff886466320956 h: refs/heads/master i:   188317:
 f026ae4269250568ac06ad7fc0f54fa69108480c   188315:
 c435a5f368f025e607de8594df5a275059c98118   188311:
 30b6688ae90bc99b9d5dda86fa003bf4f327e5dc   188303:
 81ec2fa9064fb9416ae4ecc062693aa2531caa1f   188287:
 7c1552d984a35e7fa2ce127a78aff757c31a4570 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/scsi/Kconfig      | 6 ++++++
 trunk/drivers/scsi/raid_class.c | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 674ef4c3e106..ca55c66a6d1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98e1e0f07c3f1820b8ac424569ee9e9916d3665b
+refs/heads/master: fac829fdcaf451a20106cbc468ff886466320956
diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig
index 9191d1ea6451..75f2336807cb 100644
--- a/trunk/drivers/scsi/Kconfig
+++ b/trunk/drivers/scsi/Kconfig
@@ -1,9 +1,15 @@
 menu "SCSI device support"
 
+config SCSI_MOD
+       tristate
+       default y if SCSI=n || SCSI=y
+       default m if SCSI=m
+
 config RAID_ATTRS
 	tristate "RAID Transport Class"
 	default n
 	depends on BLOCK
+	depends on SCSI_MOD
 	---help---
 	  Provides RAID
 
diff --git a/trunk/drivers/scsi/raid_class.c b/trunk/drivers/scsi/raid_class.c
index bd88349b8526..2c146b44d95f 100644
--- a/trunk/drivers/scsi/raid_class.c
+++ b/trunk/drivers/scsi/raid_class.c
@@ -63,6 +63,7 @@ static int raid_match(struct attribute_container *cont, struct device *dev)
 	 * emulated RAID devices, so start with SCSI */
 	struct raid_internal *i = ac_to_raid_internal(cont);
 
+#if defined(CONFIG_SCSI) || defined(CONFIG_SCSI_MODULE)
 	if (scsi_is_sdev_device(dev)) {
 		struct scsi_device *sdev = to_scsi_device(dev);
 
@@ -71,6 +72,7 @@ static int raid_match(struct attribute_container *cont, struct device *dev)
 
 		return i->f->is_raid(dev);
 	}
+#endif
 	/* FIXME: look at other subsystems too */
 	return 0;
 }