Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index efbae4b..b77238d 100644 (file)
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -47,7 +47,7 @@
    TBD:
    * look at deferring rx frames rather than discarding (as per tulip)
    * handle tx ring full as per tulip
-   * performace test to tune rx_copybreak
+   * performance test to tune rx_copybreak
 
    Most of my modifications relate to the braindead big-endian
    implementation by Intel.  When the i596 is operating in
@@ -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)