From: Arnd Bergmann Date: Thu, 15 Mar 2012 15:50:27 +0000 (+0000) Subject: Merge branch 'fixes' of git://gitorious.org/linux-davinci/linux-davinci into next... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f82989bde1cfa5e2b4614d8e4896d795dae418d9;p=linux-beck.git 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 --- f82989bde1cfa5e2b4614d8e4896d795dae418d9 diff --cc arch/arm/mach-ux500/Kconfig index d205de47d3c6,c59e8b892d6b..9ec635812349 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@@ -5,13 -5,14 +5,13 @@@ config UX500_SOC_COMMO default y select ARM_GIC select HAS_MTU - select ARM_ERRATA_753970 + select PL310_ERRATA_753970 select ARM_ERRATA_754322 select ARM_ERRATA_764369 - -menu "Ux500 SoC" + select CACHE_L2X0 config UX500_SOC_DB5500 - bool "DB5500" + bool select MFD_DB5500_PRCMU config UX500_SOC_DB8500