diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 11:38:27 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 11:38:27 +0200 |
| commit | c721be2807467819d16db4d61a4c5db539bcc1c7 (patch) | |
| tree | ee166b44ad37480d3f05b6a0930bd69e16c6fbf9 /arch/arm/configs | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable (diff) | |
| parent | ARM: imx: move mx3 support to mach-imx (diff) | |
| download | linux-c721be2807467819d16db4d61a4c5db539bcc1c7.tar.xz linux-c721be2807467819d16db4d61a4c5db539bcc1c7.zip | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mx1_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/mx51_defconfig | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/mx1_defconfig b/arch/arm/configs/mx1_defconfig index b39b5ced8a10..c9436d0bf593 100644 --- a/arch/arm/configs/mx1_defconfig +++ b/arch/arm/configs/mx1_defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH_MXC=y CONFIG_ARCH_MX1=y CONFIG_ARCH_MX1ADS=y CONFIG_MACH_SCB9328=y +CONFIG_MACH_APF9328=y CONFIG_MXC_IRQ_PRIOR=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y diff --git a/arch/arm/configs/mx51_defconfig b/arch/arm/configs/mx51_defconfig index e3c903281f70..0ace16cba9b5 100644 --- a/arch/arm/configs/mx51_defconfig +++ b/arch/arm/configs/mx51_defconfig @@ -13,7 +13,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_LBDAF is not set # CONFIG_BLK_DEV_BSG is not set CONFIG_ARCH_MXC=y -CONFIG_ARCH_MX5=y +CONFIG_ARCH_MX51=y CONFIG_MACH_MX51_BABBAGE=y CONFIG_MACH_MX51_3DS=y CONFIG_MACH_EUKREA_CPUIMX51=y |