1 files changed, 2 insertions, 14 deletions

diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 571dd80fb850..1f86240bc0f8 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -1834,7 +1834,6 @@ static void hp100_rx(struct net_device *dev)
                                         ptr[9], ptr[10], ptr[11]);
 #endif
                         netif_rx(skb);
-                        dev->last_rx = jiffies;
                         lp->stats.rx_packets++;
                         lp->stats.rx_bytes += pkt_len;
                 }
@@ -1925,7 +1924,6 @@ static void hp100_rx_bm(struct net_device *dev)
 
                                 netif_rx(ptr->skb);     /* Up and away... */
 
-                                dev->last_rx = jiffies;
                                 lp->stats.rx_packets++;
                                 lp->stats.rx_bytes += pkt_len;
                         }
@@ -2093,9 +2091,8 @@ static void hp100_set_multicast_list(struct net_device *dev)
                                 addrs = dmi->dmi_addr;
                                 if ((*addrs & 0x01) == 0x01) {  /* multicast address? */
 #ifdef HP100_DEBUG
-                                        DECLARE_MAC_BUF(mac);
-                                        printk("hp100: %s: multicast = %s, ",
-                                                     dev->name, print_mac(mac, addrs));
+                                        printk("hp100: %s: multicast = %pM, ",
+                                                     dev->name, addrs);
 #endif
                                         for (j = idx = 0; j < 6; j++) {
                                                 idx ^= *addrs++ & 0x3f;
@@ -3057,12 +3054,3 @@ static void __exit hp100_module_exit(void)
 
 module_init(hp100_module_init)
 module_exit(hp100_module_exit)
-
-
-/*
- * Local variables:
- *  compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O6 -m486 -c hp100.c"
- *  c-indent-level: 2
- *  tab-width: 8
- * End:
- */