summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1995-10-31 18:28:55 +0000
committerphk <phk@FreeBSD.org>1995-10-31 18:28:55 +0000
commit1a49ad40237678180367a41394d016b246838946 (patch)
tree37fd1aed74b5b244c11d2e1a2af7402be27eeb52 /sys/conf
parentaacbfecce47a169fe68d51a1938f2b1367c1b894 (diff)
downloadFreeBSD-src-1a49ad40237678180367a41394d016b246838946.zip
FreeBSD-src-1a49ad40237678180367a41394d016b246838946.tar.gz
Get pccard stuff into LINT.
rename i386/isa/pcic.c to .../pcicx.c this file will go away when the if_ze and if_zp dies.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/NOTES9
-rw-r--r--sys/conf/files.i3866
2 files changed, 11 insertions, 4 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 168b9f8..a66fc6a 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.208 1995/10/31 07:42:49 julian Exp $
+# $Id: LINT,v 1.209 1995/10/31 17:00:03 joerg Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -788,6 +788,13 @@ device fpa0
device meteor0
options PROBE_VERBOSE
+
+#
+# PCCARD/PCMCIA
+#
+controller crd0
+controller pcic0 at crd?
+
#
# Laptop/Notebook options:
#
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 8f50bc2..6eb3e16 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $Id: files.i386,v 1.110 1995/10/10 08:04:10 swallace Exp $
+# $Id: files.i386,v 1.111 1995/10/28 16:57:35 markm Exp $
#
aic7xxx_asm optional ahc device-driver \
dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \
@@ -105,8 +105,8 @@ i386/isa/npx.c optional npx device-driver
i386/isa/pcaudio.c optional pca device-driver
i386/isa/matcd/matcd.c optional matcd device-driver
i386/isa/pcibus.c optional pci device-driver
-i386/isa/pcic.c optional ze device-driver
-i386/isa/pcic.c optional zp device-driver
+i386/isa/pcicx.c optional ze device-driver
+i386/isa/pcicx.c optional zp device-driver
i386/isa/random.c standard
i386/eisa/eisaconf.c optional eisa
i386/eisa/eisadevs.c optional eisa
OpenPOWER on IntegriCloud