Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[pandora-kernel.git] / drivers / usb / atm / Kconfig

diff --git a/drivers/usb/atm/Kconfig b/drivers/usb/atm/Kconfig
index 550ddfa..be0b8da 100644 (file)
--- a/drivers/usb/atm/Kconfig
+++ b/drivers/usb/atm/Kconfig
@@ -2,10 +2,7 @@
 # USB/ATM DSL configuration
 #
 
-menu "USB DSL modem support"
-       depends on USB
-
-config USB_ATM
+menuconfig USB_ATM
        tristate "USB DSL modem support"
        depends on USB && ATM
        select CRC32
@@ -18,9 +15,10 @@ config USB_ATM
          To compile this driver as a module, choose M here: the
          module will be called usbatm.
 
+if USB_ATM
+
 config USB_SPEEDTOUCH
        tristate "Speedtouch USB support"
-       depends on USB_ATM
        select FW_LOADER
        help
          Say Y here if you have an SpeedTouch USB or SpeedTouch 330
@@ -33,7 +31,6 @@ config USB_SPEEDTOUCH
 
 config USB_CXACRU
        tristate "Conexant AccessRunner USB support"
-       depends on USB_ATM
        select FW_LOADER
        help
          Say Y here if you have an ADSL USB modem based on the Conexant
@@ -46,7 +43,6 @@ config USB_CXACRU
 
 config USB_UEAGLEATM
        tristate "ADI 930 and eagle USB DSL modem"
-       depends on USB_ATM
        select FW_LOADER
        help
          Say Y here if you have an ADSL USB modem based on the ADI 930
@@ -59,15 +55,14 @@ config USB_UEAGLEATM
 
 config USB_XUSBATM
        tristate "Other USB DSL modem support"
-       depends on USB_ATM
        help
          Say Y here if you have a DSL USB modem not explicitly supported by
          another USB DSL drivers.  In order to use your modem you will need to
          pass the vendor ID, product ID, and endpoint numbers for transmission
-         and reception as module parameters.  You may need to initialize the
+         and reception as module parameters.  You may need to initialize
          the modem using a user space utility (a firmware loader for example).
 
          To compile this driver as a module, choose M here: the
          module will be called xusbatm.
 
-endmenu
+endif # USB_ATM