imp 2004-10-11 00:58:24 UTC FreeBSD src repository Modified files: sys/i386/isa pbio.c Log: Fix conflicts I didn't fix before I committed my busspace changes. Noticed by: ru@ (and likely tinderbox, I haven't checked) Revision Changes Path 1.5 +2 -4 src/sys/i386/isa/pbio.c