diff options
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 11 | ||||
| -rw-r--r-- | sys/dev/pcmcia/files.pcmcia | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 6ff9d50f3c0..616b4b0fc68 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.49 1999/01/02 00:02:53 niklas Exp $ +# $OpenBSD: files.i386,v 1.50 1999/01/20 18:28:46 niklas Exp $ # $NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $ # # new style config file for i386 architecture @@ -97,12 +97,6 @@ attach pcib at pci file arch/i386/pci/pcib.c pcib # -# Pcmcia, before ISA (to define device stuff) -# - -#include "../../../dev/pcmcia/files.pcmcia" - -# # ISA and mixed ISA+EISA or ISA+PCI or ISA+PCMCIA drivers # @@ -278,3 +272,6 @@ file dev/isa/i82365_isasubr.c pcic_isa | pcic_isapnp # include "dev/pcmcia/files.pcmcia" +# i386-specific PCMCIA drivers +attach pccom at pcmcia with com_pcmcia +file dev/pcmcia/com_pcmcia.c com_pcmcia diff --git a/sys/dev/pcmcia/files.pcmcia b/sys/dev/pcmcia/files.pcmcia index f244cc59cec..cdac02ba93f 100644 --- a/sys/dev/pcmcia/files.pcmcia +++ b/sys/dev/pcmcia/files.pcmcia @@ -1,4 +1,4 @@ -# $OpenBSD: files.pcmcia,v 1.11 1998/11/06 06:32:15 fgsch Exp $ +# $OpenBSD: files.pcmcia,v 1.12 1999/01/20 18:28:46 niklas 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. @@ -25,7 +25,7 @@ file dev/pcmcia/if_ne_pcmcia.c ne_pcmcia attach aic at pcmcia with aic_pcmcia file dev/pcmcia/aic_pcmcia.c aic_pcmcia -attach pccom at pcmcia with com_pcmcia +attach com at pcmcia with com_pcmcia file dev/pcmcia/com_pcmcia.c com_pcmcia # Digital RoamAbout / Lucent WaveLAN PCMCIA card |