diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-19 16:54:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-19 16:54:35 -0500 |
| commit | df0bcfe0f811a73077c06f75e440397e89ba58a4 (patch) | |
| tree | 0d59d32430f337acda23a18b2e0116a2b9dcd51f /arch/arm/mach-omap2/Kconfig | |
| parent | 215e83d971a04f04d191c7f702943412a19408fd (diff) | |
| parent | a2075a7aff5f469b91029c14f216dc169d1bd5f3 (diff) | |
Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index b6625130831d..4f01533083cc 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -43,8 +43,10 @@ config ARCH_OMAP4 | |||
| 43 | bool "TI OMAP4" | 43 | bool "TI OMAP4" |
| 44 | default y | 44 | default y |
| 45 | depends on ARCH_OMAP2PLUS | 45 | depends on ARCH_OMAP2PLUS |
| 46 | select CACHE_L2X0 | ||
| 46 | select CPU_V7 | 47 | select CPU_V7 |
| 47 | select ARM_GIC | 48 | select ARM_GIC |
| 49 | select HAVE_SMP | ||
| 48 | select LOCAL_TIMERS if SMP | 50 | select LOCAL_TIMERS if SMP |
| 49 | select PL310_ERRATA_588369 | 51 | select PL310_ERRATA_588369 |
| 50 | select PL310_ERRATA_727915 | 52 | select PL310_ERRATA_727915 |