From 4315525d62803d0f10f789926190c6341bf464e8 Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.miao@marvell.com>
Date: Sat, 27 Sep 2008 18:07:48 +0800
Subject: [PATCH] --- yaml --- r: 112463 b: refs/heads/master c:
 e7f3c60037fcad0edc0b79b8d285418246bcef40 h: refs/heads/master i:   112461:
 ccaba411abca10aedfd473af376e3d4d539ec716   112459:
 09b61d98423ef10c1622ef5375edba41326715b9   112455:
 09977149ed9477dba7a3edf5bc96c8cb35f69f3a   112447:
 996fb8414eafb1c95806a02042f0ef4141a21db7 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-pxa/mfp-pxa2xx.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 80b3375ef69d..d003611c6a4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a89770daad83df74d77a8d34a1ffaedae565ce9
+refs/heads/master: e7f3c60037fcad0edc0b79b8d285418246bcef40
diff --git a/trunk/arch/arm/mach-pxa/mfp-pxa2xx.c b/trunk/arch/arm/mach-pxa/mfp-pxa2xx.c
index 3ee1f39062e9..2061c00c8ead 100644
--- a/trunk/arch/arm/mach-pxa/mfp-pxa2xx.c
+++ b/trunk/arch/arm/mach-pxa/mfp-pxa2xx.c
@@ -338,6 +338,9 @@ static int __init pxa2xx_mfp_init(void)
 {
 	int i;
 
+	if (!cpu_is_pxa2xx())
+		return 0;
+
 	if (cpu_is_pxa25x())
 		pxa25x_mfp_init();