diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-05-21 18:49:48 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-05-21 18:49:48 +0000 |
| commit | 3742e50ea9434f8e936f2e22dc4fba9389a78d56 (patch) | |
| tree | 3307581645dec46b44f81a837516b11e6f4363bb /sys/dev/pcmcia | |
| parent | c1e9f26e6231e37c635af5509b31b59d1d04b4c2 (diff) | |
Switch i386 from pccom to com. Welcomed by many.
ok dlg@, jsing@, deraadt@
Diffstat (limited to 'sys/dev/pcmcia')
| -rw-r--r-- | sys/dev/pcmcia/com_pcmcia.c | 17 | ||||
| -rw-r--r-- | sys/dev/pcmcia/files.pcmcia | 4 |
2 files changed, 3 insertions, 18 deletions
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c index 5337269bc36..cfaca73a91d 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.46 2006/05/28 16:49:46 fkr Exp $ */ +/* $OpenBSD: com_pcmcia.c,v 1.47 2008/05/21 18:49:47 kettenis Exp $ */ /* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */ /* @@ -118,17 +118,9 @@ #include <dev/pcmcia/pcmciadevs.h> #include "com.h" -#ifdef i386 -#include "pccom.h" -#endif #include <dev/ic/comreg.h> -#if NPCCOM > 0 -#include <i386/isa/pccomvar.h> -#endif -#if NCOM > 0 #include <dev/ic/comvar.h> -#endif #include <dev/ic/ns16550reg.h> #include <dev/isa/isareg.h> @@ -164,17 +156,10 @@ struct com_pcmcia_softc { void *sc_ih; /* interrupt handler */ }; -#if NCOM struct cfattach com_pcmcia_ca = { sizeof(struct com_pcmcia_softc), com_pcmcia_match, com_pcmcia_attach, com_pcmcia_detach, com_pcmcia_activate }; -#elif NPCCOM -struct cfattach pccom_pcmcia_ca = { - sizeof(struct com_pcmcia_softc), com_pcmcia_match, com_pcmcia_attach, - com_pcmcia_detach, com_pcmcia_activate -}; -#endif int com_pcmcia_match(parent, match, aux) diff --git a/sys/dev/pcmcia/files.pcmcia b/sys/dev/pcmcia/files.pcmcia index 417a9143b0b..d512786aa62 100644 --- a/sys/dev/pcmcia/files.pcmcia +++ b/sys/dev/pcmcia/files.pcmcia @@ -1,4 +1,4 @@ -# $OpenBSD: files.pcmcia,v 1.42 2008/04/23 13:28:59 jsg Exp $ +# $OpenBSD: files.pcmcia,v 1.43 2008/05/21 18:49:47 kettenis Exp $ # $NetBSD: files.pcmcia,v 1.9 1998/06/21 18:45:41 christos Exp $ # # Config.new file and device description for machine-independent PCMCIA code. @@ -31,7 +31,7 @@ attach esp at pcmcia with esp_pcmcia file dev/pcmcia/esp_pcmcia.c esp_pcmcia attach com at pcmcia with com_pcmcia -file dev/pcmcia/com_pcmcia.c com_pcmcia | pccom_pcmcia +file dev/pcmcia/com_pcmcia.c com_pcmcia # PCMCIA IDE controller attach wdc at pcmcia with wdc_pcmcia |