diff options
Diffstat (limited to 'arch/arm/plat-orion/mpp.c')
| -rw-r--r-- | arch/arm/plat-orion/mpp.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-orion/mpp.c b/arch/arm/plat-orion/mpp.c index 7740bb31d66..e686fe76a96 100644 --- a/arch/arm/plat-orion/mpp.c +++ b/arch/arm/plat-orion/mpp.c @@ -18,15 +18,15 @@  #include <plat/mpp.h>  /* Address of the ith MPP control register */ -static __init unsigned long mpp_ctrl_addr(unsigned int i, -					  unsigned long dev_bus) +static __init void __iomem *mpp_ctrl_addr(unsigned int i, +					  void __iomem *dev_bus)  {  	return dev_bus + (i) * 4;  }  void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask, -			   unsigned int mpp_max, unsigned int dev_bus) +			   unsigned int mpp_max, void __iomem *dev_bus)  {  	unsigned int mpp_nr_regs = (1 + mpp_max/8);  	u32 mpp_ctrl[mpp_nr_regs];  |