I've just about finished merging the latest tar balls and I'm a bit
concerned about sys/dev/isa/if_ep.c

The version in the tar files appears to have knowledge of bus type
PCMCIA, but that's it.  My merge has used that code plus all the
previous pcmcia stuff from Stefan.  Is this the right approach? for
now anyway?

Nothing else appears pcmcia aware yet, so the above does not seem too
far out - just a bit messy.

--sjg