diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 20:28:04 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 20:28:04 +0200 |
| commit | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch) | |
| tree | 894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/mach-mxs/Kconfig | |
| parent | Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and... (diff) | |
| parent | ARM: Fix generic irq chip (diff) | |
| download | linux-9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0.tar.xz linux-9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0.zip | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h
Diffstat (limited to 'arch/arm/mach-mxs/Kconfig')
| -rw-r--r-- | arch/arm/mach-mxs/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig index edacefac2270..f114960622e0 100644 --- a/arch/arm/mach-mxs/Kconfig +++ b/arch/arm/mach-mxs/Kconfig @@ -34,7 +34,6 @@ config MACH_MX23EVK select MXS_HAVE_PLATFORM_AUART select MXS_HAVE_PLATFORM_MXS_MMC select MXS_HAVE_PLATFORM_MXSFB - default y help Include support for MX23EVK platform. This includes specific configurations for the board and its peripherals. @@ -49,7 +48,6 @@ config MACH_MX28EVK select MXS_HAVE_PLATFORM_MXS_MMC select MXS_HAVE_PLATFORM_MXSFB select MXS_OCOTP - default y help Include support for MX28EVK platform. This includes specific configurations for the board and its peripherals. |