diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-19 16:46:32 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 05:41:43 -0400 |
| commit | b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc (patch) | |
| tree | 065282434bde6ef9b4357c042705c5fcef3782ea /arch/arm/mach-vexpress | |
| parent | c0206e228e34d8b414fcc63db45b831843adea06 (diff) | |
| parent | 5cd9eb2736a572a9ef2689829f47ffd4262adc00 (diff) | |
Merge branch 'renesas/timer' into next/timer
Conflicts:
arch/arm/mach-shmobile/timer.c
This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-vexpress')
| -rw-r--r-- | arch/arm/mach-vexpress/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index 9b3d0fbaee72..88c3ba151e87 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig | |||
| @@ -7,7 +7,7 @@ config ARCH_VEXPRESS_CA9X4 | |||
| 7 | select ARM_GIC | 7 | select ARM_GIC |
| 8 | select ARM_ERRATA_720789 | 8 | select ARM_ERRATA_720789 |
| 9 | select ARM_ERRATA_751472 | 9 | select ARM_ERRATA_751472 |
| 10 | select ARM_ERRATA_753970 | 10 | select PL310_ERRATA_753970 |
| 11 | select HAVE_SMP | 11 | select HAVE_SMP |
| 12 | select MIGHT_HAVE_CACHE_L2X0 | 12 | select MIGHT_HAVE_CACHE_L2X0 |
| 13 | 13 | ||