summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authornate <nate@FreeBSD.org>1996-05-13 04:29:14 +0000
committernate <nate@FreeBSD.org>1996-05-13 04:29:14 +0000
commit5450bb7184f972e87d7729b38689ff3f68cc64e3 (patch)
tree17339e110014f06ddbcc2ee41d8b3343a78d5ad4 /sys/amd64
parent49922e5d261201daefd79f37feea09277704dfe0 (diff)
downloadFreeBSD-src-5450bb7184f972e87d7729b38689ff3f68cc64e3.zip
FreeBSD-src-5450bb7184f972e87d7729b38689ff3f68cc64e3.tar.gz
Added commented out PCCARD entries to GENERIC, also document and add
entries in LINT.
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/conf/GENERIC6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 694220f..46a9c58 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -1,7 +1,7 @@
#
# GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
#
-# $Id: GENERIC,v 1.68 1996/04/29 20:03:41 jkh Exp $
+# $Id: GENERIC,v 1.69 1996/05/01 03:26:58 bde Exp $
#
machine "i386"
@@ -98,6 +98,10 @@ device npx0 at isa? port "IO_NPX" irq 13 vector npxintr
#
device apm0 at isa? disable # Advanced Power Management
options APM_BROKEN_STATCLOCK # Workaround some buggy APM BIOS
+# PCCARD (PCMCIA) support
+#controller crd0
+#device pcic0 at crd?
+#device pcic1 at crd?
device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr
device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr
OpenPOWER on IntegriCloud