Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

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

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 5df5d0fe258a29ad05ebb0a218975fc7d0b9e008..c1e65dfd93538349f07b4d056bbdc2d25a0709a5 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -2,10 +2,7 @@
 # USB Serial device configuration
 #
 
-menu "USB Serial Converter support"
-       depends on USB!=n
-
-config USB_SERIAL
+menuconfig USB_SERIAL
        tristate "USB Serial Converter support"
        depends on USB
        ---help---
@@ -20,6 +17,8 @@ config USB_SERIAL
          To compile this driver as a module, choose M here: the
          module will be called usbserial.
 
+if USB_SERIAL
+
 config USB_SERIAL_CONSOLE
        bool "USB Serial Console device support (EXPERIMENTAL)"
        depends on USB_SERIAL=y && EXPERIMENTAL
@@ -606,6 +605,4 @@ config USB_SERIAL_DEBUG
          To compile this driver as a module, choose M here: the
          module will be called usb-debug.
 
-
-endmenu
-
+endif # USB_SERIAL