Part 2: The USB menu.
In many config submenus, the first menu option will enable the rest
of the menu options. For these menus, It's appropriate to use the more
convenient "menuconfig" keyword.
Patch for .13-rc1. Only offset changes compared to .12.
--- rc1-a/./drivers/usb/net/Kconfig 2005-06-30 11:21:50.000000000 +0200
+++ rc1-b/./drivers/usb/net/Kconfig 2005-07-04 11:52:34.000000000 +0200
@@ -2,10 +2,13 @@
# USB Network devices configuration
#
comment "Networking support is needed for USB Network Adapter support"
- depends on USB && !NET
+ depends on !NET
-menu "USB Network Adapters"
- depends on USB && NET
+menuconfig USB_NET_DEVICES
+ bool "USB Network Adapters"
+ depends on NET
+
+if USB_NET_DEVICES
config USB_CATC
tristate "USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)"
@@ -308,4 +311,4 @@ config USB_ZD1201
To compile this driver as a module, choose M here: the
module will be called zd1201.
-endmenu
+endif
--- rc1-a/./drivers/usb/input/Kconfig 2005-06-30 11:22:40.000000000 +0200
+++ rc1-b/./drivers/usb/input/Kconfig 2005-07-04 11:52:34.000000000 +0200
@@ -2,11 +2,9 @@
# USB Input driver configuration
#
comment "USB Input Devices"
- depends on USB
config USB_HID
tristate "USB Human Interface Device (full HID) support"
- depends on USB
---help---
Say Y here if you want full HID support to connect keyboards,
mice, joysticks, graphic tablets, or any other HID based devices
--- rc1-a/./drivers/usb/Kconfig 2005-06-30 11:21:48.000000000 +0200
+++ rc1-b/./drivers/usb/Kconfig 2005-07-04 11:52:34.000000000 +0200
@@ -2,8 +2,6 @@
# USB device configuration
#
-menu "USB support"
-
# Host-side USB depends on having a host controller
# NOTE: dummy_hcd is always an option, but it's ignored here ...
# NOTE: SL-811 option should be board-specific ...
@@ -29,9 +27,12 @@ config USB_ARCH_HAS_OHCI
# more:
default PCI
+comment "USB (host side) may require PCI"
+ depends on !USB_ARCH_HAS_HCD && !PCI
+
# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
-config USB
- tristate "Support for Host-side USB"
+menuconfig USB
+ tristate "USB (host side)"
depends on USB_ARCH_HAS_HCD
---help---
Universal Serial Bus (USB) is a specification for a serial bus
@@ -65,6 +66,8 @@ config USB
To compile this driver as a module, choose M here: the
module will be called usbcore.
+if USB
+
source "drivers/usb/core/Kconfig"
source "drivers/usb/host/Kconfig"
@@ -84,11 +87,10 @@ source "drivers/usb/net/Kconfig"
source "drivers/usb/mon/Kconfig"
comment "USB port drivers"
- depends on USB
config USB_USS720
tristate "USS720 parport driver"
- depends on USB && PARPORT
+ depends on PARPORT
select PARPORT_NOT_PC
---help---
This driver is for USB parallel port adapters that use the Lucent
@@ -121,7 +123,7 @@ source "drivers/usb/misc/Kconfig"
source "drivers/usb/atm/Kconfig"
-source "drivers/usb/gadget/Kconfig"
+endif
-endmenu
+source "drivers/usb/gadget/Kconfig"
--- rc1-a/./drivers/usb/gadget/Kconfig 2005-06-30 11:22:40.000000000 +0200
+++ rc1-b/./drivers/usb/gadget/Kconfig 2005-07-04 11:52:34.000000000 +0200
@@ -12,10 +12,8 @@
# 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 Gadgets (device side)"
help
USB is a master/slave protocol, organized with one master
host (such as a PC) controlling up to 127 peripheral devices.
@@ -394,5 +392,3 @@ config USB_G_SERIAL
# - none yet
endchoice
-
-endmenu
--- rc1-a/./drivers/usb/serial/Kconfig 2005-07-04 11:36:04.000000000 +0200
+++ rc1-b/./drivers/usb/serial/Kconfig 2005-07-04 11:52:34.000000000 +0200
@@ -4,7 +4,6 @@
menuconfig USB_SERIAL
tristate "USB Serial Converter support"
- depends on USB
---help---
Say Y here if you have a USB device that provides normal serial
ports, or acts like a serial device, and you want to connect it to
--
Today's assembler command: EXOP Execute Operator
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
