diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-28 19:45:57 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-28 19:45:57 +0200 |
| commit | e76e3ac69e62d3f93e935526bc9afa371e7f38ba (patch) | |
| tree | 2e1e712fc4b633a73187876e235381137abb0173 /arch/arm/mm | |
| parent | [ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout (diff) | |
| parent | [ARM] add Sascha Hauer as Freescale i.MX Maintainer (diff) | |
| download | linux-e76e3ac69e62d3f93e935526bc9afa371e7f38ba.tar.xz linux-e76e3ac69e62d3f93e935526bc9afa371e7f38ba.zip | |
Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 3a6c8ec34cd9..399d1d66bf93 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -187,7 +187,7 @@ config CPU_ARM926T ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \ ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \ ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \ - ARCH_NS9XXX || ARCH_DAVINCI + ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2 default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \ ARCH_OMAP730 || ARCH_OMAP16XX || \ ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \ |