diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-09 13:05:00 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-09 13:05:15 -0700 |
| commit | 5497e7b8967118ee45f8ef2d301fce919a35d660 (patch) | |
| tree | ef4633712579d9a06fce69c0748580fe05ca19ab /arch/arm/mach-ux500 | |
| parent | 8cbc95ee748741939222c3d38584a40c92bedcdd (diff) | |
| parent | eb16d33273532533400cb95189aa50d6b734db57 (diff) | |
Merge branch 'late/fixes' into fixes
* late/fixes:
ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP
ARM: ux500: always select ABX500_CORE
ARM: SIRF: select SMP_ON_UP only on SMP builds
ARM: SPEAr: conditionalize l2x0 support
ARM: imx: build CPU suspend code only when needed
ARM: OMAP: build SMP code only for OMAP4/5
ARM: tegra: Tegra114 needs CPU_FREQ_TABLE
ARM: default machine descriptor for multiplatform
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-ux500')
| -rw-r--r-- | arch/arm/mach-ux500/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index f66d7deae46d..6a4387e39df8 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -19,6 +19,8 @@ if ARCH_U8500 config UX500_SOC_COMMON bool default y + select ABX500_CORE + select AB8500_CORE select ARM_ERRATA_754322 select ARM_ERRATA_764369 if SMP select ARM_GIC |