diff options
Diffstat (limited to 'arch/arm/mach-pxa/pxa930.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa930.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/pxa930.c b/arch/arm/mach-pxa/pxa930.c index 13e6bfdfff60..71131742fffd 100644 --- a/arch/arm/mach-pxa/pxa930.c +++ b/arch/arm/mach-pxa/pxa930.c | |||
@@ -16,10 +16,9 @@ | |||
16 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
17 | #include <linux/dma-mapping.h> | 17 | #include <linux/dma-mapping.h> |
18 | 18 | ||
19 | #include <mach/hardware.h> | 19 | #include <mach/pxa930.h> |
20 | #include <mach/mfp-pxa930.h> | ||
21 | 20 | ||
22 | static struct pxa3xx_mfp_addr_map pxa930_mfp_addr_map[] __initdata = { | 21 | static struct mfp_addr_map pxa930_mfp_addr_map[] __initdata = { |
23 | 22 | ||
24 | MFP_ADDR(GPIO0, 0x02e0), | 23 | MFP_ADDR(GPIO0, 0x02e0), |
25 | MFP_ADDR(GPIO1, 0x02dc), | 24 | MFP_ADDR(GPIO1, 0x02dc), |
@@ -180,8 +179,8 @@ static struct pxa3xx_mfp_addr_map pxa930_mfp_addr_map[] __initdata = { | |||
180 | static int __init pxa930_init(void) | 179 | static int __init pxa930_init(void) |
181 | { | 180 | { |
182 | if (cpu_is_pxa930()) { | 181 | if (cpu_is_pxa930()) { |
183 | pxa3xx_init_mfp(); | 182 | mfp_init_base(io_p2v(MFPR_BASE)); |
184 | pxa3xx_mfp_init_addr(pxa930_mfp_addr_map); | 183 | mfp_init_addr(pxa930_mfp_addr_map); |
185 | } | 184 | } |
186 | 185 | ||
187 | return 0; | 186 | return 0; |