aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-10-14 09:37:34 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-10-14 09:37:34 +0200
commitc5d7a9230e5e277f262b6806b7f4d6b35de5a3fb (patch)
tree706a24566c3ac3966d0f2d8db56a97f7cff0dcd2 /arch/arm/configs
parentd546029043202ab306630fd2a10221feaed029e3 (diff)
parentea42a0d058428845047206ff895e60520a7ff256 (diff)
Merge branch 'features/denx-mx28' into for-arnd-features
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/mxs_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index db2cb7d180d..6ee781bf6bf 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -26,6 +26,7 @@ CONFIG_MACH_MX23EVK=y
CONFIG_MACH_MX28EVK=y
CONFIG_MACH_STMP378X_DEVB=y
CONFIG_MACH_TX28=y
+CONFIG_MACH_M28EVK=y
# CONFIG_ARM_THUMB is not set
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y