diff --git a/[refs] b/[refs]
index b863112e174f..8bfb84ccb0d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cc49a5ca14348f225beb888ad383064f2a96876
+refs/heads/master: d41f2d17f863fcd9496748135967e71551d5873d
diff --git a/trunk/drivers/net/natsemi.c b/trunk/drivers/net/natsemi.c
index 4cf0d3fcb519..460a08718c69 100644
--- a/trunk/drivers/net/natsemi.c
+++ b/trunk/drivers/net/natsemi.c
@@ -690,7 +690,7 @@ static ssize_t natsemi_set_dspcfg_workaround(struct device *dev,
 {
 	struct netdev_private *np = netdev_priv(to_net_dev(dev));
 	int new_setting;
-	u32 flags;
+	unsigned long flags;
 
         /* Find out the new setting */
         if (!strncmp("on", buf, count - 1) || !strncmp("1", buf, count - 1))