[NET]: Fix multiple eth0 mixed PCI/ISA init.

This patch for 2.6 fixes the problem found by Zoltan Farkas
with mixed PCI/ISA and a non-modular config.  The problem is the old_netdev
ISA probing isn't skipping eth0 which already got assigned by the PCI
initialization.

diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index ceef07fa3f729e4339f3bcdf82ddf571b9891881..8d2489f6aae56d7c2823d3835ac997c76f129ddd 100644 (file)
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -350,7 +350,7 @@ static int __init ethif_probe(int unit)
         * Backwards compatibility - historically an I/O base of 1 was 
         * used to indicate not to probe for this ethN interface 
         */
-       if (dev->base_addr == 1) {
+       if (__dev_get_by_name(dev->name) || dev->base_addr == 1) {
                free_netdev(dev);
                return -ENXIO;
        }