From: Igor Grinberg <grinberg@compulab.co.il>
Date: Tue, 20 Jul 2010 07:58:52 +0000 (+0300)
Subject: pxa/cm-x300: fix ffuart registration
X-Git-Tag: v2.6.35.2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c53f89ac7b1b89a7132e59a1a8dc548eaeb10556;p=people%2Fms%2Flinux.git

pxa/cm-x300: fix ffuart registration

commit a6cd7eb374647b572ae9e7dbfe49871e6996e8e0 upstream.

ffuart is available on cm-x300 only with pxa300.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index fdda6be6c391..d717b49f0172 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -745,9 +745,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();