Merge tag 'v3.10-rc1' into stable/for-linus-3.10

[~andy/linux] / drivers / usb / class / Kconfig

diff --git a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig
index 316aac8e4ca1934a34989d0d39c68bc47b46786a..bb8b73682a70ccf28dc7669368c892a187594007 100644 (file)
--- a/drivers/usb/class/Kconfig
+++ b/drivers/usb/class/Kconfig
@@ -2,11 +2,10 @@
 # USB Class driver configuration
 #
 comment "USB Device Class drivers"
-       depends on USB
 
 config USB_ACM
        tristate "USB Modem (CDC ACM) support"
-       depends on USB && TTY
+       depends on TTY
        ---help---
          This driver supports USB modems and ISDN adapters which support the
          Communication Device Class Abstract Control Model interface.
@@ -21,7 +20,6 @@ config USB_ACM
 
 config USB_PRINTER
        tristate "USB Printer support"
-       depends on USB
        help
          Say Y here if you want to connect a USB printer to your computer's
          USB port.
@@ -31,7 +29,6 @@ config USB_PRINTER
 
 config USB_WDM
        tristate "USB Wireless Device Management support"
-       depends on USB
        ---help---
          This driver supports the WMC Device Management functionality
          of cell phones compliant to the CDC WMC specification. You can use
@@ -42,7 +39,6 @@ config USB_WDM
 
 config USB_TMC
        tristate "USB Test and Measurement Class support"
-       depends on USB
        help
          Say Y here if you want to connect a USB device that follows
          the USB.org specification for USB Test and Measurement devices