From 2b5cce673425a409266e1409fa1acea73dc3f61b Mon Sep 17 00:00:00 2001
From: Al Viro <viro@www.linux.org.uk>
Date: Mon, 25 Apr 2005 07:55:58 -0700
Subject: [PATCH] --- yaml --- r: 431 b: refs/heads/master c:
 dc074a8a32bc12e19436b087f01f4a4700e9b9c0 h: refs/heads/master i:   429:
 c76cb820df46c9b6c41d8ce2751f6afa99a56ac1   427:
 aef3d1541d373711347d6f171b887652333fadce   423:
 c9d787e0f6663832755b9a6687e9ace0442dba2c   415:
 0c297ca5901ae5455f6567d0085d475ea08a31fd v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/mv643xx_eth.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e0082a93a26f..7fac10467152 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91de1fff2d431fec1162333a1e4fad9a53cd5b9e
+refs/heads/master: dc074a8a32bc12e19436b087f01f4a4700e9b9c0
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index 7e94d455533c..0405e1f0d3df 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/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);