diff --git a/[refs] b/[refs]
index 1d78096acb8d..27e760b79eec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15c8bb1284c2e4b0614274602f0d92c4ea3412df
+refs/heads/master: 6b80778d3d7424b8f0a45052742d065ec491abd8
diff --git a/trunk/drivers/net/ethernet/smsc/smc911x.c b/trunk/drivers/net/ethernet/smsc/smc911x.c
index 1538d5442bab..9dd842dbb859 100644
--- a/trunk/drivers/net/ethernet/smsc/smc911x.c
+++ b/trunk/drivers/net/ethernet/smsc/smc911x.c
@@ -2036,7 +2036,7 @@ static int smc911x_drv_probe(struct platform_device *pdev)
 	struct net_device *ndev;
 	struct resource *res;
 	struct smc911x_local *lp;
-	unsigned int *addr;
+	void __iomem *addr;
 	int ret;
 
 	DBG(SMC_DEBUG_FUNC, "--> %s\n",  __func__);