diff options
| -rw-r--r-- | drivers/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/firewire/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/ieee1394/Kconfig | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 9c52a0449d2..050323fd79e 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -30,8 +30,6 @@ source "drivers/md/Kconfig" source "drivers/message/fusion/Kconfig" -source "drivers/firewire/Kconfig" - source "drivers/ieee1394/Kconfig" source "drivers/message/i2o/Kconfig" diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig index 8e14675f92d..048d52e69d1 100644 --- a/drivers/firewire/Kconfig +++ b/drivers/firewire/Kconfig @@ -1,8 +1,6 @@ # -*- shell-script -*- -menu "IEEE 1394 (FireWire) support (JUJU alternative stack)" - -comment "This is an EXPERIMENTAL set of alternative FireWire drivers." +comment "An alternative FireWire stack is available with EXPERIMENTAL=y" depends on EXPERIMENTAL=n config FW @@ -47,4 +45,3 @@ config FW_SBP2 You should also enable support for disks, CD-ROMs, etc. in the SCSI configuration section. -endmenu diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig index b8a47342cd2..c668538201b 100644 --- a/drivers/ieee1394/Kconfig +++ b/drivers/ieee1394/Kconfig @@ -2,6 +2,8 @@ menu "IEEE 1394 (FireWire) support" +source "drivers/firewire/Kconfig" + config IEEE1394 tristate "IEEE 1394 (FireWire) support" depends on PCI || BROKEN |