diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 15:13:59 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 15:13:59 -0400 |
| commit | 83fe628e16d84efc8df2731bc403eae4e4f53801 (patch) | |
| tree | 9a51c292235621d0f4f632c2a55ddb5a6ab582af /arch/arm/mach-ux500/Kconfig | |
| parent | 853a0231e057c04255a848f6998f84faaa635c58 (diff) | |
| parent | 426f1af947c61dee48a9267f84bff227e503a547 (diff) | |
Merge branch 'renesas/soc' into next/soc2
Diffstat (limited to 'arch/arm/mach-ux500/Kconfig')
| -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 5cfa5390e0fd..d07a3afc38c0 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 | ||