aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-13 08:03:28 -0400
committerArnd Bergmann <arnd@arndb.de>2014-03-21 13:26:12 -0400
commit152c55553eca4677305649abd6cc909f9c21ff26 (patch)
treea11ead1f38669ec5cecc6b783ef5104597fead4d
parentdd94d3558947756b102b1487911acd925224a38c (diff)
ARM: integrator: only select pl01x if TTY is enabled
Building the integrator platform without TTY support currently results in a build failure because we always turn on the pl010 or pl011 drivers. Changing this to a conditional 'select' statement enables us to build more random configurations, although it should have little impact for practical configurations. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Russell King <linux@arm.linux.org.uk> Cc: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/mach-integrator/Kconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index abeff25532ab..271a255864d2 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -6,8 +6,8 @@ config ARCH_INTEGRATOR_AP
6 bool "Support Integrator/AP and Integrator/PP2 platforms" 6 bool "Support Integrator/AP and Integrator/PP2 platforms"
7 select CLKSRC_MMIO 7 select CLKSRC_MMIO
8 select MIGHT_HAVE_PCI 8 select MIGHT_HAVE_PCI
9 select SERIAL_AMBA_PL010 9 select SERIAL_AMBA_PL010 if TTY
10 select SERIAL_AMBA_PL010_CONSOLE 10 select SERIAL_AMBA_PL010_CONSOLE if TTY
11 select SOC_BUS 11 select SOC_BUS
12 help 12 help
13 Include support for the ARM(R) Integrator/AP and 13 Include support for the ARM(R) Integrator/AP and
@@ -18,8 +18,8 @@ config ARCH_INTEGRATOR_CP
18 select ARCH_CINTEGRATOR 18 select ARCH_CINTEGRATOR
19 select ARM_TIMER_SP804 19 select ARM_TIMER_SP804
20 select PLAT_VERSATILE_CLCD 20 select PLAT_VERSATILE_CLCD
21 select SERIAL_AMBA_PL011 21 select SERIAL_AMBA_PL011 if TTY
22 select SERIAL_AMBA_PL011_CONSOLE 22 select SERIAL_AMBA_PL011_CONSOLE if TTY
23 select SOC_BUS 23 select SOC_BUS
24 help 24 help
25 Include support for the ARM(R) Integrator CP platform. 25 Include support for the ARM(R) Integrator CP platform.