diff options
author | James Bottomley <James.Bottomley@suse.de> | 2010-03-03 00:36:56 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-03-03 10:47:06 -0500 |
commit | fac829fdcaf451a20106cbc468ff886466320956 (patch) | |
tree | 8fd1efcabda65db1abd0bb385367bf3f8389e4db /drivers/scsi/Kconfig | |
parent | 98e1e0f07c3f1820b8ac424569ee9e9916d3665b (diff) |
[SCSI] raid_attrs: fix dependency problems
RAID attributes uses scsi_is_sdev_device() to gate some SCSI specific
checking code. This causes two problems. Firstly if SCSI == n just
defining scsi_is_sdev_device() to return false might not be enough to
prevent gcc from emitting the code (and thus referring to undefined
symbols), so this needs surrounding with an ifdef. Secondly, using
scsi_is_sdev_device() when SCSI is either y or m gives a subtle
problem in the m case: raid_attrs must also be m to use the symbol.
Do the usual Kconfig jiggery-pokery to fix this.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/Kconfig')
-rw-r--r-- | drivers/scsi/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 9191d1ea6451..75f2336807cb 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -1,9 +1,15 @@ | |||
1 | menu "SCSI device support" | 1 | menu "SCSI device support" |
2 | 2 | ||
3 | config SCSI_MOD | ||
4 | tristate | ||
5 | default y if SCSI=n || SCSI=y | ||
6 | default m if SCSI=m | ||
7 | |||
3 | config RAID_ATTRS | 8 | config RAID_ATTRS |
4 | tristate "RAID Transport Class" | 9 | tristate "RAID Transport Class" |
5 | default n | 10 | default n |
6 | depends on BLOCK | 11 | depends on BLOCK |
12 | depends on SCSI_MOD | ||
7 | ---help--- | 13 | ---help--- |
8 | Provides RAID | 14 | Provides RAID |
9 | 15 | ||