diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:42 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:42 -0400 |
| commit | b6825d2df55aa7d7341c715b577b73a6a03dc944 (patch) | |
| tree | ae4f0f52f4c2ad4e501dd323318486ccdd7fcd93 /arch/arm/mm/Kconfig | |
| parent | 6defd90433729c2d795865165cb34d938d8ff07c (diff) | |
| parent | aa59e19d05114f9fb7718d6bc8398255476fb4f5 (diff) | |
Merge branch 'omap-all' into devel
Conflicts:
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/irq.c
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 330814d1ee25..d1193884d76d 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -428,7 +428,7 @@ config CPU_32v6K | |||
| 428 | # ARMv7 | 428 | # ARMv7 |
| 429 | config CPU_V7 | 429 | config CPU_V7 |
| 430 | bool "Support ARM V7 processor" | 430 | bool "Support ARM V7 processor" |
| 431 | depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB | 431 | depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP3 |
| 432 | select CPU_32v6K | 432 | select CPU_32v6K |
| 433 | select CPU_32v7 | 433 | select CPU_32v7 |
| 434 | select CPU_ABRT_EV7 | 434 | select CPU_ABRT_EV7 |