Commit b75be4ab authored by Denis Cheng's avatar Denis Cheng Committed by Greg Kroah-Hartman
Browse files

USB: Use menuconfig objects 



commit 04d06ad0 have added menuconfig support
for the whole USB Kconfig, but there are still menuconfig need for usb/serial,
usb/atm, and usb/gadget, so that the user can disable all the options in that
menu at once instead of having to disable each option separately.

Signed-off-by: default avatarDenis Cheng <crquan@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f54aab6e

drivers/usb/atm/Kconfig

+4 −5
Original line number Diff line number Diff line
@@ -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,6 +15,8 @@ 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
@@ -70,4 +69,4 @@ config USB_XUSBATM 
	  To compile this driver as a module, choose M here: the

	  module will be called xusbatm.



endmenu
 
endif # USB_ATM

drivers/usb/gadget/Kconfig

+5 −4
Original line number Diff line number Diff line
@@ -12,10 +12,9 @@ 
# With help from a special transceiver and a "Mini-AB" jack, systems with

# both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG).

#

menu "USB Gadget Support"



config USB_GADGET

	tristate "Support for USB Gadgets"

menuconfig USB_GADGET

	tristate "USB Gadget Support"

	help

	   USB is a master/slave protocol, organized with one master

	   host (such as a PC) controlling up to 127 peripheral devices.
@@ -42,6 +41,8 @@ config USB_GADGET 
	   For more information, see <http://www.linux-usb.org/gadget> and

	   the kernel DocBook documentation for this API.



if USB_GADGET



config USB_GADGET_DEBUG

	boolean "Debugging messages"

	depends on USB_GADGET && DEBUG_KERNEL && EXPERIMENTAL
@@ -570,4 +571,4 @@ config USB_G_PRINTER 


endchoice



endmenu
 
endif # USB_GADGET

drivers/usb/serial/Kconfig

+4 −7
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE