diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-14 09:37:34 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-14 09:37:34 +0200 |
commit | c5d7a9230e5e277f262b6806b7f4d6b35de5a3fb (patch) | |
tree | 706a24566c3ac3966d0f2d8db56a97f7cff0dcd2 /arch/arm/configs | |
parent | Merge branch 'features/ahci' into for-arnd-features (diff) | |
parent | ARM: mxs: Add initial support for DENX MX28 (diff) | |
download | linux-c5d7a9230e5e277f262b6806b7f4d6b35de5a3fb.tar.xz linux-c5d7a9230e5e277f262b6806b7f4d6b35de5a3fb.zip |
Merge branch 'features/denx-mx28' into for-arnd-features
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/mxs_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index db2cb7d180dc..6ee781bf6bf1 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 |