Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=22a38e72bc18b9e8b860182c512efaade5590c7d
Commit:     22a38e72bc18b9e8b860182c512efaade5590c7d
Parent:     687198bbd2679cb72cf381da070082d3d9f57edf
Author:     Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 31 17:20:20 2006 +0100
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Fri Mar 9 22:02:38 2007 +0100

    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 <[EMAIL PROTECTED]>
---
 drivers/Kconfig          |    2 --
 drivers/firewire/Kconfig |    5 +----
 drivers/ieee1394/Kconfig |    2 ++
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 9c52a04..050323f 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 8e14675..048d52e 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 b8a4734..c668538 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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to