diff --git a/[refs] b/[refs]
index dd4cf0312af1..f879a9f8c29d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13b2738cbb4b59f695bd72bcaabd71317e7731d2
+refs/heads/master: 2726fcf0dab1a9b1fd04dea3837b2b0bb639c1bd
diff --git a/trunk/drivers/net/au1000_eth.c b/trunk/drivers/net/au1000_eth.c
index cb8be490e5ae..5ee1b0557a02 100644
--- a/trunk/drivers/net/au1000_eth.c
+++ b/trunk/drivers/net/au1000_eth.c
@@ -807,7 +807,7 @@ static struct net_device * au1000_probe(int port_num)
 static int au1000_init(struct net_device *dev)
 {
 	struct au1000_private *aup = (struct au1000_private *) dev->priv;
-	u32 flags;
+	unsigned long flags;
 	int i;
 	u32 control;