29c29
< __FBSDID("$FreeBSD: head/sys/dev/ed/if_ed.c 139749 2005-01-06 01:43:34Z imp $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ed/if_ed.c 140468 2005-01-19 07:37:32Z imp $");
87c87
< static void ds_getmcaf (struct ed_softc *, u_int32_t *);
---
> static void ds_getmcaf (struct ed_softc *, uint32_t *);
3077,3080c3077,3080
< u_int32_t *dl = (u_int32_t *) dst;
< volatile u_int32_t *const sl =
< (u_int32_t *) sc->hpp_mem_start;
< u_int32_t *const fence = dl + (amount >> 2);
---
> uint32_t *dl = (uint32_t *) dst;
> volatile uint32_t *const sl =
> (uint32_t *) sc->hpp_mem_start;
> uint32_t *const fence = dl + (amount >> 2);
3245,3248c3245,3248
< volatile u_int32_t *const dl =
< (volatile u_int32_t *) d;
< u_int32_t *sl = (u_int32_t *) data;
< u_int32_t *fence = sl + (len >> 2);
---
> volatile uint32_t *const dl =
> (volatile uint32_t *) d;
> uint32_t *sl = (uint32_t *) data;
> uint32_t *fence = sl + (len >> 2);
3464c3464
< u_int32_t mcaf[2];
---
> uint32_t mcaf[2];
3511c3511
< u_int32_t *mcaf;
---
> uint32_t *mcaf;
3513c3513
< register u_int32_t index;
---
> register uint32_t index;