Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / mac89x0.c

diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index a19b5958cee949e89548bbb50acf7768ac44de2f..4ce8afd481c3f13bd75caa570c5597c28b2a68cb 100644 (file)
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -183,6 +183,9 @@ struct net_device * __init mac89x0_probe(int unit)
        int err = -ENODEV;
        DECLARE_MAC_BUF(mac);
 
+       if (!MACH_IS_MAC)
+               return ERR_PTR(-ENODEV);
+
        dev = alloc_etherdev(sizeof(struct net_local));
        if (!dev)
                return ERR_PTR(-ENOMEM);
@@ -289,7 +292,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: