X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fmac89x0.c;h=2ee477c84b06c97f3b09256cf194dde064aff981;hb=c3056065400aeb437390e1a86b85f9c32fb1c1df;hp=a19b5958cee949e89548bbb50acf7768ac44de2f;hpb=f768f9d3757be475a20cb5f9d63bda45934150b1;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index a19b5958cee..2ee477c84b0 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -181,7 +181,9 @@ struct net_device * __init mac89x0_probe(int unit)
 	unsigned long ioaddr;
 	unsigned short sig;
 	int err = -ENODEV;
-	DECLARE_MAC_BUF(mac);
+
+	if (!MACH_IS_MAC)
+		return ERR_PTR(-ENODEV);
 
 	dev = alloc_etherdev(sizeof(struct net_local));
 	if (!dev)
@@ -276,8 +278,7 @@ struct net_device * __init mac89x0_probe(int unit)
 
 	/* print the IRQ and ethernet address. */
 
-	printk(" IRQ %d ADDR %s\n",
-	       dev->irq, print_mac(mac, dev->dev_addr));
+	printk(" IRQ %d ADDR %pM\n", dev->irq, dev->dev_addr);
 
 	dev->open		= net_open;
 	dev->stop		= net_close;
@@ -289,7 +290,7 @@ struct net_device * __init mac89x0_probe(int unit)
 	err = register_netdev(dev);
 	if (err)
 		goto out1;
-	return 0;
+	return NULL;
 out1:
 	nubus_writew(0, dev->base_addr + ADD_PORT);
 out:
@@ -515,7 +516,6 @@ net_rx(struct net_device *dev)
 
         skb->protocol=eth_type_trans(skb,dev);
 	netif_rx(skb);
-	dev->last_rx = jiffies;
 	lp->stats.rx_packets++;
 	lp->stats.rx_bytes += length;
 }