X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2FKconfig;fp=drivers%2Fusb%2FKconfig;h=85dacc92545ae18b1a4d13a689047d2c9589bb8c;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=005043197527142749965cce1d75fde169773c4c;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 005043197..85dacc925 100644
--- 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
-	default y if USB_ARCH_HAS_EHCI
 	default y if ARM				# SL-811
 	default PCI
 
@@ -23,8 +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_EP93XX
-	default y if (ARCH_AT91RM9200 || ARCH_AT91SAM9261)
 	# PPC:
 	default y if STB03xxx
 	default y if PPC_MPC52xx
@@ -33,13 +30,6 @@ config USB_ARCH_HAS_OHCI
 	# 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"
@@ -88,6 +78,8 @@ source "drivers/usb/input/Kconfig"
 
 source "drivers/usb/image/Kconfig"
 
+source "drivers/usb/media/Kconfig"
+
 source "drivers/usb/net/Kconfig"
 
 source "drivers/usb/mon/Kconfig"