diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-20 23:43:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-20 23:43:18 +0100 |
| commit | 9bfe99a8f95122f83f3c894b1071b61e2b6d4990 (patch) | |
| tree | e322752b04deb314b579cae2c5c9993453775823 /arch/arm/configs | |
| parent | f72caf7e496465182eeda842ac66a5e75404ddf1 (diff) | |
| parent | 54c1f6367c2836a85e821a010085ed04ab2235bc (diff) | |
| download | linux-9bfe99a8f95122f83f3c894b1071b61e2b6d4990.tar.gz linux-9bfe99a8f95122f83f3c894b1071b61e2b6d4990.tar.bz2 linux-9bfe99a8f95122f83f3c894b1071b61e2b6d4990.zip | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mx51_defconfig | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/arch/arm/configs/mx51_defconfig b/arch/arm/configs/mx51_defconfig index c88e9527a8ec..a708fd6d6ffe 100644 --- a/arch/arm/configs/mx51_defconfig +++ b/arch/arm/configs/mx51_defconfig @@ -809,7 +809,22 @@ CONFIG_SSB_POSSIBLE=y CONFIG_DUMMY_CONSOLE=y # CONFIG_SOUND is not set # CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_EHCI_MXC=y + + CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set |