can: sja1000 platform data fixes

[safe/jmp/linux-2.6] / drivers / net / hydra.c

diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c
index 8ac0930..24724b4 100644 (file)
--- a/drivers/net/hydra.c
+++ b/drivers/net/hydra.c
@@ -17,7 +17,6 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -173,9 +172,9 @@ static int __devinit hydra_init(struct zorro_dev *z)
 
     zorro_set_drvdata(z, dev);
 
-    printk(KERN_INFO "%s: Hydra at 0x%08lx, address "
+    printk(KERN_INFO "%s: Hydra at 0x%08llx, address "
           "%pM (hydra.c " HYDRA_VERSION ")\n",
-          dev->name, z->resource.start, dev->dev_addr);
+          dev->name, (unsigned long long)z->resource.start, dev->dev_addr);
 
     return 0;
 }