Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / ax88796.c

diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index d19874bf07062d78ac120509a9da25e2878b456f..90e0734e60375abe0325cc5cfd0c7a49e0b9c43f 100644 (file)
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -459,7 +459,7 @@ static int ax_open(struct net_device *dev)
        struct ei_device *ei_local = netdev_priv(dev);
        int ret;
 
-       dev_dbg(ax->dev, "%s: open\n", dev->name);
+       dev_dbg(&ax->dev->dev, "%s: open\n", dev->name);
 
        ret = request_irq(dev->irq, ax_ei_interrupt, 0, dev->name, dev);
        if (ret)
@@ -492,7 +492,7 @@ static int ax_close(struct net_device *dev)
        struct ax_device *ax = to_ax_dev(dev);
        struct ei_device *ei_local = netdev_priv(dev);
 
-       dev_dbg(ax->dev, "%s: close\n", dev->name);
+       dev_dbg(&ax->dev->dev, "%s: close\n", dev->name);
 
        /* turn the phy off */
 
@@ -580,7 +580,6 @@ static const struct ethtool_ops ax_ethtool_ops = {
        .set_settings           = ax_set_settings,
        .nway_reset             = ax_nway_reset,
        .get_link               = ax_get_link,
-       .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 /* setup code */
@@ -819,11 +818,12 @@ 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",
-                       res->start, res->end);
+               dev_err(&pdev->dev, "Cannot ioremap area (%08llx,%08llx)\n",
+                       (unsigned long long)res->start,
+                       (unsigned long long)res->end);
 
                ret = -ENXIO;
                goto exit_req;