diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
| commit | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch) | |
| tree | 894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/mach-mxs/Kconfig | |
| parent | ec19628d72cff8f80220b7cedba089074ac6a599 (diff) | |
| parent | dc7ad3b3d5f1cd0a0d16c05dd3ad3898979d261e (diff) | |
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 | |||
| 34 | select MXS_HAVE_PLATFORM_AUART | 34 | select MXS_HAVE_PLATFORM_AUART |
| 35 | select MXS_HAVE_PLATFORM_MXS_MMC | 35 | select MXS_HAVE_PLATFORM_MXS_MMC |
| 36 | select MXS_HAVE_PLATFORM_MXSFB | 36 | select MXS_HAVE_PLATFORM_MXSFB |
| 37 | default y | ||
| 38 | help | 37 | help |
| 39 | Include support for MX23EVK platform. This includes specific | 38 | Include support for MX23EVK platform. This includes specific |
| 40 | configurations for the board and its peripherals. | 39 | configurations for the board and its peripherals. |
| @@ -49,7 +48,6 @@ config MACH_MX28EVK | |||
| 49 | select MXS_HAVE_PLATFORM_MXS_MMC | 48 | select MXS_HAVE_PLATFORM_MXS_MMC |
| 50 | select MXS_HAVE_PLATFORM_MXSFB | 49 | select MXS_HAVE_PLATFORM_MXSFB |
| 51 | select MXS_OCOTP | 50 | select MXS_OCOTP |
| 52 | default y | ||
| 53 | help | 51 | help |
| 54 | Include support for MX28EVK platform. This includes specific | 52 | Include support for MX28EVK platform. This includes specific |
| 55 | configurations for the board and its peripherals. | 53 | configurations for the board and its peripherals. |