git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
usb
/
Kconfig
diff --git
a/drivers/usb/Kconfig
b/drivers/usb/Kconfig
index
7fdbc5d
..
85dacc9
100644
(file)
--- a/
drivers/usb/Kconfig
+++ b/
drivers/usb/Kconfig
@@
-10,7
+10,6
@@
menu "USB support"
config USB_ARCH_HAS_HCD
boolean
default y if USB_ARCH_HAS_OHCI
config USB_ARCH_HAS_HCD
boolean
default y if USB_ARCH_HAS_OHCI
- default y if USB_ARCH_HAS_EHCI
default y if ARM # SL-811
default PCI
default y if ARM # SL-811
default PCI
@@
-23,7
+22,6
@@
config USB_ARCH_HAS_OHCI
default y if ARCH_LH7A404
default y if ARCH_S3C2410
default y if PXA27x
default y if ARCH_LH7A404
default y if ARCH_S3C2410
default y if PXA27x
- default y if ARCH_AT91RM9200
# PPC:
default y if STB03xxx
default y if PPC_MPC52xx
# PPC:
default y if STB03xxx
default y if PPC_MPC52xx
@@
-32,13
+30,6
@@
config USB_ARCH_HAS_OHCI
# more:
default PCI
# more:
default PCI
-# some non-PCI hcds implement EHCI
-config USB_ARCH_HAS_EHCI
- boolean
- default y if PPC_83xx
- default y if SOC_AU1200
- default PCI
-
# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
config USB
tristate "Support for Host-side USB"
# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
config USB
tristate "Support for Host-side USB"
@@
-87,6
+78,8
@@
source "drivers/usb/input/Kconfig"
source "drivers/usb/image/Kconfig"
source "drivers/usb/image/Kconfig"
+source "drivers/usb/media/Kconfig"
+
source "drivers/usb/net/Kconfig"
source "drivers/usb/mon/Kconfig"
source "drivers/usb/net/Kconfig"
source "drivers/usb/mon/Kconfig"