rtl8180: adapt for deprecated IEEE80211_CONF_SHORT_SLOT_TIME flag

[karo-tx-linux.git] / drivers / net / hp.c

diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index 8281209ededf9be993b0ad0d2c8ed0e69af2b8bc..3669194f10630c7da9919645dadf4902f7e781c5 100644 (file)
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
@@ -127,7 +127,6 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
        int i, retval, board_id, wordmode;
        const char *name;
        static unsigned version_printed;
-       DECLARE_MAC_BUF(mac);
 
        if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME))
                return -EBUSY;
@@ -161,7 +160,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
        for(i = 0; i < ETHER_ADDR_LEN; i++)
                dev->dev_addr[i] = inb(ioaddr + i);
 
-       printk(" %s", print_mac(mac, dev->dev_addr));
+       printk(" %pM", dev->dev_addr);
 
        /* Snarf the interrupt now.  Someday this could be moved to open(). */
        if (dev->irq < 2) {
@@ -389,7 +388,7 @@ static void __init
 hp_init_card(struct net_device *dev)
 {
        int irq = dev->irq;
-       NS8390_init(dev, 0);
+       NS8390p_init(dev, 0);
        outb_p(irqmap[irq&0x0f] | HP_RUN,
                   dev->base_addr - NIC_OFFSET + HP_CONFIGURE);
        return;