diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 15:50:27 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 15:51:06 +0000 |
commit | f82989bde1cfa5e2b4614d8e4896d795dae418d9 (patch) | |
tree | 970cd7c833fad85acbf00be335b0ae8c4991b375 /arch/arm/mach-ux500 | |
parent | 695d82fae9160406acb9de204c471248abcc2a9f (diff) | |
parent | 30c766bdeccf945615097ca185326c1d7199f023 (diff) | |
download | op-kernel-dev-f82989bde1cfa5e2b4614d8e4896d795dae418d9.zip op-kernel-dev-f82989bde1cfa5e2b4614d8e4896d795dae418d9.tar.gz |
Merge branch 'fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical
* 'fixes' of git://gitorious.org/linux-davinci/linux-davinci: (2 commits)
ARM: davinci: DA850: move da850_register_pm to .init.text
ARM: davinci: cpufreq: fix compiler warning
(update to 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 d205de4..9ec6358 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 select CACHE_L2X0 |