diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-03-05 15:13:44 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-03-05 15:13:44 +0000 |
| commit | 2a6717033d1b4bdfd2059bd214b207258aa5b125 (patch) | |
| tree | c10fb2db561f8dc02fc9e77b9134a4c90bd4bd90 /sys/arch/i386/conf | |
| parent | 2c90b1af83c3c0b71ed656ab28ee37701b3c1eea (diff) | |
Add support for ISAPnP i82365-based PCMCIA controllers; from NetBSD. UNTESTED.
These cards are probably very rare. deraadt@ ok
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 02fde436bf0..6c51ee2bce2 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.244 2001/02/22 00:59:46 chris Exp $ +# $OpenBSD: GENERIC,v 1.245 2001/03/05 15:13:42 aaron Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -66,6 +66,9 @@ pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000 pcic2 at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000 #tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000 +# ISA Plug-and-Play PCMCIA controllers +pcic* at isapnp? + # PCI PCMCIA controllers pcic* at pci? dev? function ? diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 176815735c9..b7f1b5c20ba 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.76 2001/02/25 23:24:18 aaron Exp $ +# $OpenBSD: files.i386,v 1.77 2001/03/05 15:13:43 aaron Exp $ # $NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $ # # new style config file for i386 architecture @@ -291,8 +291,8 @@ attach pcic at pci with pcic_pci file dev/pci/i82365_pci.c pcic_pci # PCIC pcmcia controller on PnP board -#attach pcic at isapnp with pcic_isapnp -#file dev/isa/i82365_isapnp.c pcic_isapnp +attach pcic at isapnp with pcic_isapnp +file dev/isa/i82365_isapnp.c pcic_isapnp # Code common to ISA and ISAPnP attachments file dev/isa/i82365_isasubr.c pcic_isa | pcic_isapnp |