---

yaml --- r: 105155 b: refs/heads/master c: d4a6780 h: refs/heads/master i: 105153: 7269590 105151: 8c5a2e8 v: v3
git-mirror · Jul 9, 2008 · 4edffd3 · 4edffd3
1 parent 36736c8
commit 4edffd3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d3dfe4a3141476a3cf59ce6d2d1c25f9b5cfae8
+refs/heads/master: d4a678080e83ff96e3933fa1e631cef3cda04bef
diff --git a/trunk/arch/arm/mach-pxa/pxa320.c b/trunk/arch/arm/mach-pxa/pxa320.c
@@ -74,16 +74,12 @@ static struct pxa3xx_mfp_addr_map pxa320_mfp_addr_map[] __initdata = {
 	MFP_ADDR_END,
 };
 
-static void __init pxa320_init_mfp(void)
-{
-	pxa3xx_init_mfp();
-	pxa3xx_mfp_init_addr(pxa320_mfp_addr_map);
-}
-
 static int __init pxa320_init(void)
 {
-	if (cpu_is_pxa320())
-		pxa320_init_mfp();
+	if (cpu_is_pxa320()) {
+		pxa3xx_init_mfp();
+		pxa3xx_mfp_init_addr(pxa320_mfp_addr_map);
+	}
 
 	return 0;
 }