From e5844bc33900054c13715653b365c5dd922699cd Mon Sep 17 00:00:00 2001 From: Igor Grinberg Date: Tue, 20 Jul 2010 10:58:52 +0300 Subject: [PATCH] --- yaml --- r: 208650 b: refs/heads/master c: a6cd7eb374647b572ae9e7dbfe49871e6996e8e0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/cm-x300.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e09930c836b8..177728659f74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2728701d1c285a36a23d2c9ffffd8cb1f953795f +refs/heads/master: a6cd7eb374647b572ae9e7dbfe49871e6996e8e0 diff --git a/trunk/arch/arm/mach-pxa/cm-x300.c b/trunk/arch/arm/mach-pxa/cm-x300.c index 8d227b4e15f3..c70e6c2f4e7c 100644 --- a/trunk/arch/arm/mach-pxa/cm-x300.c +++ b/trunk/arch/arm/mach-pxa/cm-x300.c @@ -746,9 +746,10 @@ static void __init cm_x300_init(void) { cm_x300_init_mfp(); - pxa_set_ffuart_info(NULL); pxa_set_btuart_info(NULL); pxa_set_stuart_info(NULL); + if (cpu_is_pxa300()) + pxa_set_ffuart_info(NULL); cm_x300_init_da9030(); cm_x300_init_dm9000();