From 01562ee89f90593eee628b9fca177215ac4fc5bd Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 31 Aug 2010 14:30:15 -0400 Subject: [PATCH] --- yaml --- r: 216818 b: refs/heads/master c: 1aa5f2a9c1575279baf06e94a4bd3b3b86b7f176 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/board-da830-evm.c | 3 +++ trunk/arch/arm/mach-davinci/board-da850-evm.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c9b10a1a2673..b8add0b93ab7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b3fc7bb88243371a2bd4a4990fb62a0b722efe7 +refs/heads/master: 1aa5f2a9c1575279baf06e94a4bd3b3b86b7f176 diff --git a/trunk/arch/arm/mach-davinci/board-da830-evm.c b/trunk/arch/arm/mach-davinci/board-da830-evm.c index de82739c00ec..ef1ab0b6576e 100644 --- a/trunk/arch/arm/mach-davinci/board-da830-evm.c +++ b/trunk/arch/arm/mach-davinci/board-da830-evm.c @@ -598,6 +598,9 @@ static __init void da830_evm_init(void) #ifdef CONFIG_SERIAL_8250_CONSOLE static int __init da830_evm_console_init(void) { + if (!machine_is_davinci_da830_evm()) + return 0; + return add_preferred_console("ttyS", 2, "115200"); } console_initcall(da830_evm_console_init); diff --git a/trunk/arch/arm/mach-davinci/board-da850-evm.c b/trunk/arch/arm/mach-davinci/board-da850-evm.c index c1d45d7ac45b..ac2297c69a92 100644 --- a/trunk/arch/arm/mach-davinci/board-da850-evm.c +++ b/trunk/arch/arm/mach-davinci/board-da850-evm.c @@ -859,6 +859,9 @@ static __init void da850_evm_init(void) #ifdef CONFIG_SERIAL_8250_CONSOLE static int __init da850_evm_console_init(void) { + if (!machine_is_davinci_da850_evm()) + return 0; + return add_preferred_console("ttyS", 2, "115200"); } console_initcall(da850_evm_console_init);