From: Eric Miao <eric.miao@marvell.com>
Date: Sat, 27 Sep 2008 10:07:48 +0000 (+0800)
Subject: [ARM] pxa: fix incorrect initialization of mfp sysdev when not pxa2xx
X-Git-Tag: v2.6.28-rc1~293^2~6^2~16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e7f3c60037fcad0edc0b79b8d285418246bcef40;p=karo-tx-linux.git

[ARM] pxa: fix incorrect initialization of mfp sysdev when not pxa2xx

The initialization of mfp sysdev in pxa2xx_mfp_init() shall really be
avoided when !cpu_is_pxa2xx().

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c
index 3ee1f39062e9..2061c00c8ead 100644
--- a/arch/arm/mach-pxa/mfp-pxa2xx.c
+++ b/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();