diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-12-31 17:20:20 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-03-09 22:02:38 +0100 |
| commit | 22a38e72bc18b9e8b860182c512efaade5590c7d (patch) | |
| tree | 65fa4bfb71981a9f9cb9dfa3b31f80d520197952 | |
| parent | 687198bbd2679cb72cf381da070082d3d9f57edf (diff) | |
| download | talos-op-linux-22a38e72bc18b9e8b860182c512efaade5590c7d.tar.gz talos-op-linux-22a38e72bc18b9e8b860182c512efaade5590c7d.zip | |
firewire: put old and new stack into same Kconfig submenu
Screenshot from "make menuconfig":
...
?????????????????????? IEEE 1394 (FireWire) support ???????????????????????
? Arrow keys navigate the menu. <Enter> selects submenus --->. ?
...
? ??????????????????????????????????????????????????????????????????????? ?
? ? <M> IEEE 1394 (FireWire) support (JUJU alternative stack, experim? ?
? ? <M> Support for OHCI firewire host controllers ? ?
? ? <M> Support for storage devices (SBP-2 protocol driver) ? ?
? ? <M> IEEE 1394 (FireWire) support ? ?
? ? --- Subsystem Options ? ?
? ? [ ] Excessive debugging output ? ?
...
? <Select> < Exit > < Help > ?
???????????????????????????????????????????????????????????????????????????
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| -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 9c52a0449d26..050323fd79e9 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 8e14675f92d6..048d52e69d15 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 b8a47342cd2c..c668538201bb 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 |
