ChangeSet 1.2065.4.8, 2005/03/12 23:27:24+01:00, [EMAIL PROTECTED]
kconfig: cleanup USB menu
This properly indents the USB menu.
In usb menu do not display comment when USB is disabled.
Signed-off-by: Roman Zippel <[EMAIL PROTECTED]>
Signed-off-by: Sam Ravnborg <[EMAIL PROTECTED]>
Kconfig | 25 +++++++++++++++++++++++++
host/Kconfig | 25 -------------------------
storage/Kconfig | 1 +
3 files changed, 26 insertions(+), 25 deletions(-)
diff -Nru a/drivers/usb/Kconfig b/drivers/usb/Kconfig
--- a/drivers/usb/Kconfig 2005-03-13 09:09:07 -08:00
+++ b/drivers/usb/Kconfig 2005-03-13 09:09:07 -08:00
@@ -4,6 +4,31 @@
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 ...
+config USB_ARCH_HAS_HCD
+ boolean
+ default y if USB_ARCH_HAS_OHCI
+ default y if ARM # SL-811
+ default PCI
+
+# many non-PCI SOC chips embed OHCI
+config USB_ARCH_HAS_OHCI
+ boolean
+ # ARM:
+ default y if SA1111
+ default y if ARCH_OMAP
+ default y if ARCH_LH7A404
+ default y if PXA27x
+ # PPC:
+ default y if STB03xxx
+ default y if PPC_MPC52xx
+ # MIPS:
+ default y if SOC_AU1X00
+ # more:
+ default PCI
+
# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
config USB
tristate "Support for Host-side USB"
diff -Nru a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
--- a/drivers/usb/host/Kconfig 2005-03-13 09:09:07 -08:00
+++ b/drivers/usb/host/Kconfig 2005-03-13 09:09:07 -08:00
@@ -1,28 +1,3 @@
-# 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 ...
-config USB_ARCH_HAS_HCD
- boolean
- default y if USB_ARCH_HAS_OHCI
- default y if ARM # SL-811
- default PCI
-
-# many non-PCI SOC chips embed OHCI
-config USB_ARCH_HAS_OHCI
- boolean
- # ARM:
- default y if SA1111
- default y if ARCH_OMAP
- default y if ARCH_LH7A404
- default y if PXA27x
- # PPC:
- default y if STB03xxx
- default y if PPC_MPC52xx
- # MIPS:
- default y if SOC_AU1X00
- # more:
- default PCI
-
#
# USB Host Controller Drivers
#
diff -Nru a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
--- a/drivers/usb/storage/Kconfig 2005-03-13 09:09:07 -08:00
+++ b/drivers/usb/storage/Kconfig 2005-03-13 09:09:07 -08:00
@@ -3,6 +3,7 @@
#
comment "NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be
needed; see USB_STORAGE Help for more information"
+ depends on USB
config USB_STORAGE
tristate "USB Mass Storage support"
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
