diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:46:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:46:58 -0700 |
| commit | 9374430a52dfae5c013b88f7f030c04a6774d410 (patch) | |
| tree | ce1ee8eee4e79fbb9486e810278d1092afc74a44 /drivers/usb/Kconfig | |
| parent | 66f49739fe1591197364f2dad1b67b975e8f5e85 (diff) | |
| parent | 13f9966b3ba5b45f47f2ea0eb0a90afceedfbb1f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (149 commits)
USB: ohci-pnx4008: Remove unnecessary cast of return value of kzalloc
USB: additions to the quirk list
usb-storage: implement autosuspend
USB: cdc-acm: add new device id to option driver
USB: goku_udc trivial cleanups
USB: usb gadget stack can now -DDEBUG with Kconfig
usb gadget stack: remove usb_ep_*_buffer(), part 2
usb gadget stack: remove usb_ep_*_buffer(), part 1
USB: pxa2xx_udc -- cleanups, mostly removing dma hooks
USB: pxa2xx_udc: use generic gpio layer
USB: quirk for samsung printer
USB: usb/dma doc updates
USB: drivers/usb/storage/unusual_devs.h whitespace cleanup
USB: remove Makefile reference to obsolete OHCI_AT91
USB: io_*: remove bogus termios no change checks
USB: mos7720: remove bogus no termios change check
USB: visor and whiteheat: remove bogus termios change checks
USB: pl2303: remove bogus checks and fix speed support to use tty_get_baud_rate()
USB: mos7840.c: turn this into a serial driver
USB: make the usb_device numa_node get assigned from controller
...
Diffstat (limited to 'drivers/usb/Kconfig')
| -rw-r--r-- | drivers/usb/Kconfig | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 15499b7e33f4..172a6065f5a2 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -2,9 +2,12 @@ # USB device configuration # -menu "USB support" +menuconfig USB_SUPPORT + bool "USB support" depends on HAS_IOMEM +if 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 ... @@ -12,6 +15,7 @@ config USB_ARCH_HAS_HCD boolean default y if USB_ARCH_HAS_OHCI default y if USB_ARCH_HAS_EHCI + default y if PCMCIA # sl811_cs default y if ARM # SL-811 default PCI @@ -130,5 +134,4 @@ source "drivers/usb/atm/Kconfig" source "drivers/usb/gadget/Kconfig" -endmenu - +endif # USB_SUPPORT |