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>

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 9c52a0449d266e3ff7591c825e50c17783f5f397..050323fd79e9ae78f4f528ce260e08a8ec89f38b 100644 (file)
--- 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 8e14675f92d67e75aef9173d5a9287f8f7e413eb..048d52e69d15a97d4f0f035d9761b2837366e084 100644 (file)
--- 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 b8a47342cd2ca33c08ccf20180e66f44c754d331..c668538201bbfa4980d2f35a7133b439e4283904 100644 (file)
--- 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