From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/ieee1394/Kconfig | 5 +---- drivers/scsi/Kconfig | 13 ++++--------- drivers/scsi/qla4xxx/Kconfig | 8 ++++---- 3 files changed, 9 insertions(+), 17 deletions(-) diff -puN drivers/ieee1394/Kconfig~revert-revert-iscsi-build-failure-use-depends-instead-of drivers/ieee1394/Kconfig --- a/drivers/ieee1394/Kconfig~revert-revert-iscsi-build-failure-use-depends-instead-of +++ a/drivers/ieee1394/Kconfig @@ -2,13 +2,10 @@ menu "IEEE 1394 (FireWire) support" -comment "NOTE: IEEE 1394 support requires the Networking (NET) option to be enabled first" - depends on !NET - config IEEE1394 tristate "IEEE 1394 (FireWire) support" depends on PCI || BROKEN - depends on NET + select NET help IEEE 1394 describes a high performance serial bus, which is also known as FireWire(tm) or i.Link(tm) and is used for connecting all diff -puN drivers/scsi/Kconfig~revert-revert-iscsi-build-failure-use-depends-instead-of drivers/scsi/Kconfig --- a/drivers/scsi/Kconfig~revert-revert-iscsi-build-failure-use-depends-instead-of +++ a/drivers/scsi/Kconfig @@ -29,9 +29,6 @@ config SCSI However, do not compile this as a module if your root file system (the one containing the directory /) is located on a SCSI device. -comment "NOTE: SCSI_NETLINK requires the Networking (NET) option to be enabled first" - depends on !NET - config SCSI_TGT tristate "SCSI target support" depends on SCSI && EXPERIMENTAL @@ -40,11 +37,9 @@ config SCSI_TGT If you choose M, the module will be called scsi_tgt. config SCSI_NETLINK - bool "SCSI Netlink messages" - depends on NET - ---help--- - SCSI uses Netlink messages for passing Fiber Channel transport - information. + bool + default n + select NET config SCSI_PROC_FS bool "legacy /proc/scsi/ support" @@ -241,7 +236,7 @@ config SCSI_SPI_ATTRS config SCSI_FC_ATTRS tristate "FiberChannel Transport Attributes" depends on SCSI - depends on SCSI_NETLINK + select SCSI_NETLINK help If you wish to export transport-specific information about each attached FiberChannel device to sysfs, say Y. diff -puN drivers/scsi/qla4xxx/Kconfig~revert-revert-iscsi-build-failure-use-depends-instead-of drivers/scsi/qla4xxx/Kconfig --- a/drivers/scsi/qla4xxx/Kconfig~revert-revert-iscsi-build-failure-use-depends-instead-of +++ a/drivers/scsi/qla4xxx/Kconfig @@ -1,7 +1,7 @@ config SCSI_QLA_ISCSI tristate "QLogic ISP4XXX host adapter family support" - depends on PCI && SCSI - depends on SCSI_ISCSI_ATTRS + depends on PCI && SCSI && NET + select SCSI_ISCSI_ATTRS ---help--- - This driver supports the QLogic 40xx (ISP4XXX) iSCSI host - adapter family. + This driver supports the QLogic 40xx (ISP4XXX) iSCSI host + adapter family. _