diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-09-12 22:47:07 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-12 22:47:07 -0700 |
| commit | 839a8d77c9a5e617bd07eff7c2d5fdf92aa3a5b2 (patch) | |
| tree | c5848fe4ff274dfd638a66f8fa34a5b38e20cba6 /arch/arm/configs | |
| parent | Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt (diff) | |
| parent | ARM: dts: cfa10049: Add the 74HC595 gpio expanders (diff) | |
| download | linux-dev-839a8d77c9a5e617bd07eff7c2d5fdf92aa3a5b2.tar.xz linux-dev-839a8d77c9a5e617bd07eff7c2d5fdf92aa3a5b2.zip | |
Merge tag 'mxs-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
- Remove all board files and make mach-mxs a DT-only platform
- Some dts file formatting and style fixing
- DTS update for additional boards and devices
* tag 'mxs-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6: (28 commits)
ARM: dts: cfa10049: Add the 74HC595 gpio expanders
ARM: dts: m28evk: Fix MMC WP pin being inverted
ARM: dts: cfa10049: Add SSP3 to the 10049 board
ARM: dts: mxs: Add missing address and size cells in SSP nodes
ARM: mx28evk: Add I2C EEPROM support
ARM: dts: mxs: Enable USB1 Host on the CFA-10049 expansion board
ARM: dts: mxs: Add the second I2C adapter to the CFA10049 expansion board
ARM: dts: mxs: Add I2C1 muxing options for imx28
ARM: mx28evk: Add LRADC support
ARM: mx28evk: Add SPI flash support
ARM: mxs: Update DENX M28 machine and dts file
ARM: mx28: Add USB PHY overcurrent pinmux
ARM: mx28: Add SPI 2 pinmux into imx28.dtsi
ARM: dts: mxs: Add pwm4 muxing options for imx28
ARM: dts: mxs: Add alternative I2C muxing options for imx28
ARM: olinuxino: Add gpio-led support
ARM: mxs: Let mmc0 pin detect be generic
ARM: mxs: Rename 'hog-gpios'
ARM: mxs: remove iomux driver
ARM: mxs: remove platform device codes
...
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mxs_defconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index 4edcfb4e4dee..36d60dda310c 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig @@ -23,12 +23,6 @@ CONFIG_BLK_DEV_INTEGRITY=y # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_MXS=y CONFIG_MACH_MXS_DT=y -CONFIG_MACH_MX23EVK=y -CONFIG_MACH_MX28EVK=y -CONFIG_MACH_STMP378X_DEVB=y -CONFIG_MACH_TX28=y -CONFIG_MACH_M28EVK=y -CONFIG_MACH_APX4DEVKIT=y # CONFIG_ARM_THUMB is not set CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y |