Warner Losh 905454c86c Fix conflicts I didn't fix before I committed my busspace changes. ...

Noticed by: ru@ (and likely tinderbox, I haven't checked)

2004-10-11 00:58:24 +00:00

..

ic

…

pcvt

…

atpic_vector.s

…

atpic.c

…

ccbque.h

…

clock.c

…

elcr.c

…

elink.c

…

elink.h

…

icu.h

…

if_el.c

…

if_elreg.h

…

isa_dma.c

…

isa.c

…

isa.h

…

lptreg.h

…

mse.c

…

nmi.c

…

npx.c

…

pbio.c

Fix conflicts I didn't fix before I committed my busspace changes.

2004-10-11 00:58:24 +00:00

pcf.c

…

pmtimer.c

…

prof_machdep.c

…

spic.c

…

spicreg.h

…

spkr.c

…

timerreg.h

…

vesa.c

…