From 89687aea8ed7ac878e4b0c1822bb471a2ab476dd Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 20 Dec 2011 11:56:20 +0100 Subject: [PATCH] --- yaml --- r: 279804 b: refs/heads/master c: 6efab15307265cb70f6404a17433ce9562e4af0e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-integrator/Kconfig | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9a89dea4208b..a64376ad217d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee35887e4acad8cb6b09c99e4d6a67ef7635f2fc +refs/heads/master: 6efab15307265cb70f6404a17433ce9562e4af0e diff --git a/trunk/arch/arm/mach-integrator/Kconfig b/trunk/arch/arm/mach-integrator/Kconfig index dfd18f3b50e8..350e26636a06 100644 --- a/trunk/arch/arm/mach-integrator/Kconfig +++ b/trunk/arch/arm/mach-integrator/Kconfig @@ -6,6 +6,8 @@ config ARCH_INTEGRATOR_AP bool "Support Integrator/AP and Integrator/PP2 platforms" select CLKSRC_MMIO select MIGHT_HAVE_PCI + select SERIAL_AMBA_PL010 + select SERIAL_AMBA_PL010_CONSOLE help Include support for the ARM(R) Integrator/AP and Integrator/PP2 platforms. @@ -15,6 +17,8 @@ config ARCH_INTEGRATOR_CP select ARCH_CINTEGRATOR select ARM_TIMER_SP804 select PLAT_VERSATILE_CLCD + select SERIAL_AMBA_PL011 + select SERIAL_AMBA_PL011_CONSOLE help Include support for the ARM(R) Integrator CP platform.