summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-04-19 16:10:53 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-04-19 16:10:53 +0000
commit7c4cfc5c047725e6c4c20e9adaa1ef4e70ff68d1 (patch)
treed415490c429995abee8d4ce27fac8216028a989c /sys/conf
parent6b3902486151983e34413a0e5a4bead588217855 (diff)
NetBSD 960317 merge
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 4f8c7cc2fcd..29487e32780 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.13 1996/04/19 07:31:23 mickey Exp $
+# $OpenBSD: files,v 1.14 1996/04/19 16:08:25 niklas Exp $
# $NetBSD: files,v 1.82 1996/03/19 01:02:35 paulus Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -34,6 +34,7 @@ define aic7xxx # Adaptec aic7770 and aic7870 SCSI controllers
define isabus { } # ISA attachment
define eisabus { } # EISA attachment
define pcibus {[bus = -1]} # PCI attachment
+define pcmciabus { } # PCMCIA attachment
define tcbus { } # TurboChannel attachment
# legitimate pseudo-devices