---

yaml --- r: 208650 b: refs/heads/master c: a6cd7eb h: refs/heads/master v: v3
git-mirror · Aug 5, 2010 · e5844bc · e5844bc
1 parent 9118bb1
commit e5844bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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();