1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 3199526bcecb..77f2b2934e67 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -582,7 +582,6 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
         void *ring_space;
         dma_addr_t ring_dma;
         int ret = -ENOMEM;
-        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -744,9 +743,9 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
                 goto err_out_unmap_rx;
         }
 
-        printk(KERN_INFO "%s: %s type %x at %p, %s, IRQ %d.\n",
+        printk(KERN_INFO "%s: %s type %x at %p, %pM, IRQ %d.\n",
                    dev->name, chip_tbl[chip_id].name, readl(ioaddr + ChipRev),
-                   ioaddr, print_mac(mac, dev->dev_addr), irq);
+                   ioaddr, dev->dev_addr, irq);
         i = readb(ioaddr + PCIClkMeas);
         printk(KERN_INFO "%s:  %d-bit %d Mhz PCI bus (%d), Virtual Jumpers "
                    "%2.2x, LPA %4.4x.\n",
@@ -1646,7 +1645,6 @@ static int hamachi_rx(struct net_device *dev)
 #endif  /* RX_CHECKSUM */
 
                         netif_rx(skb);
-                        dev->last_rx = jiffies;
                         hmp->stats.rx_packets++;
                 }
                 entry = (++hmp->cur_rx) % RX_RING_SIZE;