diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-28 13:45:57 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-28 13:45:57 -0400 |
| commit | e76e3ac69e62d3f93e935526bc9afa371e7f38ba (patch) | |
| tree | 2e1e712fc4b633a73187876e235381137abb0173 /arch/arm/mm/Kconfig | |
| parent | 7c896834735f497cc405068d16a51717f993af7f (diff) | |
| parent | 86183a5fd0ce67cb28d6e4af4775105edc8872b7 (diff) | |
Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/mm/Kconfig')
| -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 3a6c8ec34cd..399d1d66bf9 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -187,7 +187,7 @@ config CPU_ARM926T | |||
| 187 | ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \ | 187 | ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \ |
| 188 | ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \ | 188 | ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \ |
| 189 | ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \ | 189 | ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \ |
| 190 | ARCH_NS9XXX || ARCH_DAVINCI | 190 | ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2 |
| 191 | default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \ | 191 | default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \ |
| 192 | ARCH_OMAP730 || ARCH_OMAP16XX || \ | 192 | ARCH_OMAP730 || ARCH_OMAP16XX || \ |
| 193 | ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \ | 193 | ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \ |