aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-20 15:18:11 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-20 15:18:11 +0200
commit3b3c281073288ebdc6161108bdc4c9f1b08bdee3 (patch)
tree397f9d7b4654da2759d5f88af34b9b3bb7467e80 /arch/arm/configs
parent8eb41582d2106eccc7717047d1184481f5a1b3a6 (diff)
parentea42a0d058428845047206ff895e60520a7ff256 (diff)
downloadkernel_samsung_smdk4412-3b3c281073288ebdc6161108bdc4c9f1b08bdee3.zip
kernel_samsung_smdk4412-3b3c281073288ebdc6161108bdc4c9f1b08bdee3.tar.gz
kernel_samsung_smdk4412-3b3c281073288ebdc6161108bdc4c9f1b08bdee3.tar.bz2
Merge branch 'imx/board' into next/board
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 db2cb7d..6ee781b 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