From 4edffd311e49ceb3d0e385c78afb57aff290662f Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Thu, 12 Jun 2008 18:49:08 +0800 Subject: [PATCH] --- yaml --- r: 105155 b: refs/heads/master c: d4a678080e83ff96e3933fa1e631cef3cda04bef h: refs/heads/master i: 105153: 72695907b5efcbc1d2c520088733ce1487b7797e 105151: 8c5a2e8123bd43f0240b2f86f13b07c15c89ef87 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/pxa320.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 6061a57fce9c..083951b77ecb 100644 --- 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 index 74128eb8f8d0..44ef0b95db00 100644 --- 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; }