diff --git a/[refs] b/[refs]
index 8df988c6ed3c..013554c909ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae8d7f884a24ee920e417077b2615c6862be687f
+refs/heads/master: 78a658d9720ce1b3dd71af3ee6d207ca751a48f5
diff --git a/trunk/drivers/net/lasi_82596.c b/trunk/drivers/net/lasi_82596.c
index efbae4b8398e..a0c578585a50 100644
--- a/trunk/drivers/net/lasi_82596.c
+++ b/trunk/drivers/net/lasi_82596.c
@@ -161,12 +161,12 @@ lan_init_chip(struct parisc_device *dev)
 
 	if (!dev->irq) {
 		printk(KERN_ERR "%s: IRQ not found for i82596 at 0x%lx\n",
-			__FILE__, dev->hpa.start);
+			__FILE__, (unsigned long)dev->hpa.start);
 		return -ENODEV;
 	}
 
-	printk(KERN_INFO "Found i82596 at 0x%lx, IRQ %d\n", dev->hpa.start,
-			dev->irq);
+	printk(KERN_INFO "Found i82596 at 0x%lx, IRQ %d\n",
+			(unsigned long)dev->hpa.start, dev->irq);
 
 	netdevice = alloc_etherdev(sizeof(struct i596_private));
 	if (!netdevice)