diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 09:14:25 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 09:14:25 -0400 |
| commit | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (patch) | |
| tree | a5dd723679582505ef3905c90f0c2c032d191b94 /arch/arm/configs | |
| parent | 526b264163068f77c5f2409031f5e25caf3900a9 (diff) | |
| parent | c5d7a9230e5e277f262b6806b7f4d6b35de5a3fb (diff) | |
Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel
Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
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 | |||
| 26 | CONFIG_MACH_MX28EVK=y | 26 | CONFIG_MACH_MX28EVK=y |
| 27 | CONFIG_MACH_STMP378X_DEVB=y | 27 | CONFIG_MACH_STMP378X_DEVB=y |
| 28 | CONFIG_MACH_TX28=y | 28 | CONFIG_MACH_TX28=y |
| 29 | CONFIG_MACH_M28EVK=y | ||
| 29 | # CONFIG_ARM_THUMB is not set | 30 | # CONFIG_ARM_THUMB is not set |
| 30 | CONFIG_NO_HZ=y | 31 | CONFIG_NO_HZ=y |
| 31 | CONFIG_HIGH_RES_TIMERS=y | 32 | CONFIG_HIGH_RES_TIMERS=y |