diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 16:25:17 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 16:25:17 -0400 |
| commit | a94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78 (patch) | |
| tree | cac33ce0abaaeb56b6e08a396cb7ff4e3e3b8f61 /arch/arm/mach-ux500 | |
| parent | d4ef467aea0fdcd5e75a4bbfaf97e579bbe532f3 (diff) | |
| parent | 9652e8bd16e73f7a34cabf1ab114aaa5c97db660 (diff) | |
Merge branch 'spear/dt' into next/dt2
* spear/dt:
ARM: SPEAr600: Add device-tree support to SPEAr600 boards
(update to v3.3-rc7)
Conflicts:
arch/arm/mach-spear6xx/spear6xx.c
arch/arm/mach-vexpress/Kconfig
The conflicts are between the previous contents of the next/dt2
branch and upstream changes from v3.3-rc7.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ux500')
| -rw-r--r-- | arch/arm/mach-ux500/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index afb3706bab2a..ea908c66aebd 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig | |||
| @@ -5,7 +5,7 @@ config UX500_SOC_COMMON | |||
| 5 | default y | 5 | default y |
| 6 | select ARM_GIC | 6 | select ARM_GIC |
| 7 | select HAS_MTU | 7 | select HAS_MTU |
| 8 | select ARM_ERRATA_753970 | 8 | select PL310_ERRATA_753970 |
| 9 | select ARM_ERRATA_754322 | 9 | select ARM_ERRATA_754322 |
| 10 | select ARM_ERRATA_764369 | 10 | select ARM_ERRATA_764369 |
| 11 | 11 | ||