summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-24 20:13:59 +0100
committerArnd Bergmann <arnd@arndb.de>2012-03-24 20:13:59 +0100
commit83fe628e16d84efc8df2731bc403eae4e4f53801 (patch)
tree9a51c292235621d0f4f632c2a55ddb5a6ab582af /arch/arm/mach-ux500
parentMerge branch 'samsung/soc' into next/soc2 (diff)
parentMerge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh in... (diff)
downloadlinux-83fe628e16d84efc8df2731bc403eae4e4f53801.tar.xz
linux-83fe628e16d84efc8df2731bc403eae4e4f53801.zip
Merge branch 'renesas/soc' into next/soc2
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/Kconfig2
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
default y
select ARM_GIC
select HAS_MTU
- select ARM_ERRATA_753970
+ select PL310_ERRATA_753970
select ARM_ERRATA_754322
select ARM_ERRATA_764369