diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-19 00:38:57 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-19 00:38:57 +0000 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /drivers/usb/Kconfig | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'drivers/usb/Kconfig')
| -rw-r--r-- | drivers/usb/Kconfig | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 15499b7e33f..7dd73546bf4 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -2,8 +2,12 @@ # USB device configuration # -menu "USB support" +menuconfig USB_SUPPORT + bool "USB support" depends on HAS_IOMEM + default y + +if USB_SUPPORT # Host-side USB depends on having a host controller # NOTE: dummy_hcd is always an option, but it's ignored here ... @@ -12,6 +16,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 && !M32R # sl811_cs default y if ARM # SL-811 default PCI @@ -130,5 +135,4 @@ source "drivers/usb/atm/Kconfig" source "drivers/usb/gadget/Kconfig" -endmenu - +endif # USB_SUPPORT |