27c27
< * $FreeBSD: head/sys/dev/ed/if_ed_cbus.c 147256 2005-06-10 16:49:24Z brooks $
---
> * $FreeBSD: head/sys/dev/ed/if_ed_cbus.c 149558 2005-08-28 23:56:25Z imp $
245c245
< error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET,
---
> error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE,
619c619
< sc->mem_start = (caddr_t) rman_get_virtual(sc->mem_res);
---
> sc->mem_start = 0;
842c842
< sum = sc->mem_start[6 * 2];
---
> sum = bus_space_read_1(sc->mem_bst, sc->mem_bsh, 6 * 2);
844c844,845
< sum ^= (sc->enaddr[i] = sc->mem_start[i * 2]);
---
> sum ^= (sc->enaddr[i] =
> bus_space_read_1(sc->mem_bst, sc->mem_bsh, i * 2));
1067c1068,1069
< bcopy(sc->mem_start, sc->enaddr, ETHER_ADDR_LEN);
---
> bus_space_read_region_1(sc->mem_bst, sc->mem_bsh, sc->mem_start,
> sc->enaddr, ETHER_ADDR_LEN);
1580c1582
< sc->mem_start = (char *) page_offset;
---
> sc->mem_start = page_offset;