diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-01-21 08:55:09 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-01-21 08:55:09 +0000 |
| commit | caef934943454a2ca8e07db76857561fc1728b05 (patch) | |
| tree | 6be6a7378e7f47e32d1607b0f49692c96c9f33e0 /sys/dev | |
| parent | 8158ff90726626be9f24a399b50549872b454456 (diff) | |
Remove remnicients of old pcmcia code, allow both pccom & com at pcmcia
work again
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pcmcia/com_pcmcia.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c index 19c888d2805..efabee132cc 100644 --- a/sys/dev/pcmcia/com_pcmcia.c +++ b/sys/dev/pcmcia/com_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_pcmcia.c,v 1.10 1999/01/11 05:12:19 millert Exp $ */ +/* $OpenBSD: com_pcmcia.c,v 1.11 1999/01/21 08:55:08 niklas Exp $ */ /* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */ /*- @@ -106,6 +106,11 @@ #include <dev/isa/isareg.h> +#include "com.h" +#ifdef i386 +#include "pccom.h" +#endif + #define com_lcr com_cfcr #define SET(t, f) (t) |= (f) @@ -145,9 +150,15 @@ struct com_pcmcia_softc { void *sc_ih; /* interrupt handler */ }; +#if NCOM_PCMCIA struct cfattach com_pcmcia_ca = { sizeof(struct com_pcmcia_softc), com_pcmcia_match, com_pcmcia_attach }; +#elif NPCCOM_PCMCIA +struct cfattach pccom_pcmcia_ca = { + sizeof(struct com_pcmcia_softc), com_pcmcia_match, com_pcmcia_attach +}; +#endif /* Look for pcmcia cards with particular CIS strings */ static struct com_dev * |