30c30
< __FBSDID("$FreeBSD: head/sys/dev/ed/if_ed_isa.c 141586 2005-02-09 20:03:40Z imp $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ed/if_ed_isa.c 141932 2005-02-14 23:00:41Z imp $");
42a43
> #include <net/ethernet.h>
68,69c69
< ed_isa_probe(dev)
< device_t dev;
---
> ed_isa_probe_Novell(device_t dev)
70a71
> struct ed_softc *sc = device_get_softc(dev);
71a73,94
> int err;
>
> err = ed_probe_Novell(dev, 0, flags);
> if (err)
> return err;
> ed_Novell_read_mac(sc);
> /*
> * Final sanity check for Gateway Ethernet cards before
> * believing that they really are Gateway AT.
> */
> if ((ED_FLAGS_GETTYPE(flags) == ED_FLAGS_GWETHER) &&
> (sc->arpcom.ac_enaddr[2] == 0x86)) {
> sc->type_str = "Gateway AT";
> }
>
> return (0);
> }
>
> static int
> ed_isa_probe(device_t dev)
> {
> int flags = device_get_flags(dev);
78c101
< if (error == ENXIO) {
---
> if (error == ENXIO)
80d102
< }
83c105
< if (!(error == 0 || error == ENOENT)) {
---
> if (!(error == 0 || error == ENOENT))
85d106
< }
107c128
< error = ed_probe_Novell(dev, 0, flags);
---
> error = ed_isa_probe_Novell(dev);