diff --git a/[refs] b/[refs]
index 0fe40de2d2ae..010706bbbd54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b26e64ea39e45802c5736c8261bf8a8704d212f
+refs/heads/master: c7b17cb13eaad6adf2f169840ccb193d4376e4b1
diff --git a/trunk/drivers/net/ax88796.c b/trunk/drivers/net/ax88796.c
index 1d882360b34d..e43e8047b90e 100644
--- a/trunk/drivers/net/ax88796.c
+++ b/trunk/drivers/net/ax88796.c
@@ -819,7 +819,7 @@ static int ax_probe(struct platform_device *pdev)
 	}
 
 	ei_status.mem = ioremap(res->start, size);
-	dev->base_addr = (long)ei_status.mem;
+	dev->base_addr = (unsigned long)ei_status.mem;
 
 	if (ei_status.mem == NULL) {
 		dev_err(&pdev->dev, "Cannot ioremap area (%08zx,%08zx)\n",