diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 11:50:27 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 11:51:06 -0400 |
| commit | f82989bde1cfa5e2b4614d8e4896d795dae418d9 (patch) | |
| tree | 970cd7c833fad85acbf00be335b0ae8c4991b375 /arch/arm/mach-ux500/Kconfig | |
| parent | 695d82fae9160406acb9de204c471248abcc2a9f (diff) | |
| parent | 30c766bdeccf945615097ca185326c1d7199f023 (diff) | |
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/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 d205de47d3c6..9ec635812349 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 | select CACHE_L2X0 | 11 | select CACHE_L2X0 |