diff options
author | Olof Johansson <olof@lixom.net> | 2013-05-10 00:05:00 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-05-10 00:05:15 +0400 |
commit | 5497e7b8967118ee45f8ef2d301fce919a35d660 (patch) | |
tree | ef4633712579d9a06fce69c0748580fe05ca19ab /arch/arm/mach-omap2/Kconfig | |
parent | 8cbc95ee748741939222c3d38584a40c92bedcdd (diff) | |
parent | eb16d33273532533400cb95189aa50d6b734db57 (diff) | |
download | linux-5497e7b8967118ee45f8ef2d301fce919a35d660.tar.xz |
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-omap2/Kconfig')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 857b1f097fd8..f49cd51e162a 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -37,8 +37,6 @@ config ARCH_OMAP2PLUS_TYPICAL select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5 select PM_RUNTIME select REGULATOR - select SERIAL_OMAP - select SERIAL_OMAP_CONSOLE select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4 select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4 select VFP |