Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[linux-2.6-omap-h63xx.git] / drivers / net / mv643xx_eth.c

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 7e94d455533c678d80334d30562ceadde3b4e5d0..0405e1f0d3df183fe004173091aed6ca103751e4 100644 (file)
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -99,7 +99,7 @@ static spinlock_t mv643xx_eth_phy_lock = SPIN_LOCK_UNLOCKED;
 
 static inline u32 mv_read(int offset)
 {
-       void *__iomem reg_base;
+       void __iomem *reg_base;
 
        reg_base = mv643xx_eth_shared_base - MV643XX_ETH_SHARED_REGS;
 
@@ -108,7 +108,7 @@ static inline u32 mv_read(int offset)
 
 static inline void mv_write(int offset, u32 data)
 {
-       void * __iomem reg_base;
+       void __iomem *reg_base;
 
        reg_base = mv643xx_eth_shared_base - MV643XX_ETH_SHARED_REGS;
        writel(data, reg_base + offset);