V4L/DVB (7851): Fix FW_LOADER depencency at v4l/dvb

[linux-2.6] / drivers / net / declance.c

diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index 7e7ac3330e60ec1f25f5095202f9af3fb10d0930..6b1e77cc069e989b5d48b71911b03f5ed3ddf1f5 100644 (file)
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -719,15 +719,15 @@ out:
        spin_unlock(&lp->lock);
 }
 
-static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id)
+static irqreturn_t lance_dma_merr_int(int irq, void *dev_id)
 {
        struct net_device *dev = dev_id;
 
-       printk("%s: DMA error\n", dev->name);
+       printk(KERN_ERR "%s: DMA error\n", dev->name);
        return IRQ_HANDLED;
 }
 
-static irqreturn_t lance_interrupt(const int irq, void *dev_id)
+static irqreturn_t lance_interrupt(int irq, void *dev_id)
 {
        struct net_device *dev = dev_id;
        struct lance_private *lp = netdev_priv(dev);
@@ -1027,6 +1027,7 @@ static int __init dec_lance_probe(struct device *bdev, const int type)
        int i, ret;
        unsigned long esar_base;
        unsigned char *esar;
+       DECLARE_MAC_BUF(mac);
 
        if (dec_lance_debug && version_printed++ == 0)
                printk(version);
@@ -1214,21 +1215,20 @@ static int __init dec_lance_probe(struct device *bdev, const int type)
         */
        switch (type) {
        case ASIC_LANCE:
-               printk("%s: IOASIC onboard LANCE, addr = ", name);
+               printk("%s: IOASIC onboard LANCE", name);
                break;
        case PMAD_LANCE:
-               printk("%s: PMAD-AA, addr = ", name);
+               printk("%s: PMAD-AA", name);
                break;
        case PMAX_LANCE:
-               printk("%s: PMAX onboard LANCE, addr = ", name);
+               printk("%s: PMAX onboard LANCE", name);
                break;
        }
-       for (i = 0; i < 6; i++) {
+       for (i = 0; i < 6; i++)
                dev->dev_addr[i] = esar[i * 4];
-               printk("%2.2x%c", dev->dev_addr[i], i == 5 ? ',' : ':');
-       }
 
-       printk(" irq = %d\n", dev->irq);
+       printk(", addr = %s, irq = %d\n",
+              print_mac(mac, dev->dev_addr), dev->irq);
 
        dev->open = &lance_open;
        dev->stop = &lance_close;