Commit 0c994c03 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Martin K. Petersen

scsi_dh: force modular build if SCSI is a module

When the scsi_dh core was moved into the scsi core module,
CONFIG_SCSI_DH became a 'bool' option, and now anything depending on it
can be built-in even when CONFIG_SCSI=m. This of course cannot link
successfully:

drivers/scsi/built-in.o: In function `rdac_init':
scsi_dh_alua.c:(.init.text+0x14): undefined reference to `scsi_register_device_handler'
scsi_dh_alua.c:(.init.text+0x64): undefined reference to `scsi_unregister_device_handler'
drivers/scsi/built-in.o: In function `alua_init':
scsi_dh_alua.c:(.init.text+0xb0): undefined reference to `scsi_register_device_handler'

As a workaround, this adds an extra dependency on CONFIG_SCSI, so
Kconfig can figure out whether built-in is allowed or not.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 086b91d0 ("scsi_dh: integrate into the core SCSI code")
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ec54adfb
...@@ -13,13 +13,13 @@ menuconfig SCSI_DH ...@@ -13,13 +13,13 @@ menuconfig SCSI_DH
config SCSI_DH_RDAC config SCSI_DH_RDAC
tristate "LSI RDAC Device Handler" tristate "LSI RDAC Device Handler"
depends on SCSI_DH depends on SCSI_DH && SCSI
help help
If you have a LSI RDAC select y. Otherwise, say N. If you have a LSI RDAC select y. Otherwise, say N.
config SCSI_DH_HP_SW config SCSI_DH_HP_SW
tristate "HP/COMPAQ MSA Device Handler" tristate "HP/COMPAQ MSA Device Handler"
depends on SCSI_DH depends on SCSI_DH && SCSI
help help
If you have a HP/COMPAQ MSA device that requires START_STOP to If you have a HP/COMPAQ MSA device that requires START_STOP to
be sent to start it and cannot upgrade the firmware then select y. be sent to start it and cannot upgrade the firmware then select y.
...@@ -27,13 +27,13 @@ config SCSI_DH_HP_SW ...@@ -27,13 +27,13 @@ config SCSI_DH_HP_SW
config SCSI_DH_EMC config SCSI_DH_EMC
tristate "EMC CLARiiON Device Handler" tristate "EMC CLARiiON Device Handler"
depends on SCSI_DH depends on SCSI_DH && SCSI
help help
If you have a EMC CLARiiON select y. Otherwise, say N. If you have a EMC CLARiiON select y. Otherwise, say N.
config SCSI_DH_ALUA config SCSI_DH_ALUA
tristate "SPC-3 ALUA Device Handler" tristate "SPC-3 ALUA Device Handler"
depends on SCSI_DH depends on SCSI_DH && SCSI
help help
SCSI Device handler for generic SPC-3 Asymmetric Logical Unit SCSI Device handler for generic SPC-3 Asymmetric Logical Unit
Access (ALUA). Access (ALUA).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment