X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2FKconfig;h=85dacc92545ae18b1a4d13a689047d2c9589bb8c;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=7fdbc5dad5fd9d364a62fa95793c93b8a73734cf;hpb=e6a27dba1cf83d871b2dfcd64f04f12a67e3f4d5;p=linux-2.6.git

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 7fdbc5dad..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,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_AT91RM9200
 	# PPC:
 	default y if STB03xxx
 	default y if PPC_MPC52xx
@@ -32,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"
@@ -87,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"