Merge git://git.infradead.org/battery-2.6

[linux-2.6] / drivers / usb / atm / Kconfig

diff --git a/drivers/usb/atm/Kconfig b/drivers/usb/atm/Kconfig
index b450cbaa3a0baf91d445c5a43b0dd8d66b701646..be0b8daac9c7de2681191161415877cb3289961e 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,7 +55,6 @@ 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
@@ -70,4 +65,4 @@ config USB_XUSBATM
          To compile this driver as a module, choose M here: the
          module will be called xusbatm.
 
-endmenu
+endif # USB_ATM