diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-16 17:07:59 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-16 17:07:59 -0700 |
| commit | c74b208c3a2c8e3e38f75671c1e62e0e3e0e3996 (patch) | |
| tree | 085ca89da65796c8aebc1dec159230c81067249e /arch/arm/configs | |
| parent | f6cfa44405be73e4a02258fb0c093385064bd91d (diff) | |
| parent | 578a5d7a70b8b1b0d4df5868773d057e24a8a8c7 (diff) | |
Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/defconfig
ARM i.MX defconfig updates
* tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: imx_v6_v7_defconfig: Remove CONFIG_DEFAULT_MMAP_MIN_ADDR
ARM: imx_v6_v7_defconfig: Add Chipidea USB driver support
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 3c9f32f9b6b..defa945efae 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -42,7 +42,6 @@ CONFIG_VMSPLIT_2G=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set -CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" CONFIG_VFP=y CONFIG_NEON=y @@ -179,6 +178,9 @@ CONFIG_SND_SOC_IMX_MC13783=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_MXC=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_MXS_PHY=y CONFIG_USB_STORAGE=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y |