diff options
| author | Eric Miao | 2008-09-27 12:07:48 +0200 |
|---|---|---|
| committer | Russell King | 2008-10-07 20:12:55 +0200 |
| commit | e7f3c60037fcad0edc0b79b8d285418246bcef40 (patch) | |
| tree | d1b8d2201ef431605fa681c6521bf18ea03bd297 /arch/arm/mach-pxa | |
| parent | Merge branches 'pxa-core' and 'pxa-machines' into pxa-all (diff) | |
| download | kernel-qcow2-linux-e7f3c60037fcad0edc0b79b8d285418246bcef40.tar.gz kernel-qcow2-linux-e7f3c60037fcad0edc0b79b8d285418246bcef40.tar.xz kernel-qcow2-linux-e7f3c60037fcad0edc0b79b8d285418246bcef40.zip | |
[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>
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/mfp-pxa2xx.c | 3 |
1 files changed, 3 insertions, 0 deletions
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(); |