Catch up with GENERIC. This file is creaming to be automatically

generated form GENERIC. Any volunteers? I thought not :-). OK;
I'll do it.

1 files changed, 21 insertions, 10 deletions

diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD
index 0da4b13..f9a9fe6 100644
--- a/sys/i386/conf/PCCARD
+++ b/sys/i386/conf/PCCARD
@@ -2,14 +2,18 @@
 # PCCARD -- Generic machine with WD/AHx/NCR/BTx family disks and PCMCIA
 #           hardware support
 #
-# For more information read the handbook part System Administration -> 
-# Configuring the FreeBSD Kernel -> The Configuration File. 
-# The handbook is available in /usr/share/doc/handbook or online as
-# latest version from the FreeBSD World Wide Web server 
-# <URL:http://www.FreeBSD.ORG/>
+# For more information on this file, please read the handbook section on
+# Kernel Configuration Files:
 #
-# An exhaustive list of options and more detailed explanations of the 
-# device lines is present in the ./LINT configuration file. If you are 
+#    http://www.freebsd.org/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.ORG/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ./LINT configuration file. If you are
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
 # $FreeBSD$
@@ -152,14 +156,21 @@ device		plip0		# TCP/IP over parallel
 device		ppi0		# Parallel port interface device
 #controller	vpo0		# Requires scbus and da0
 
+# MII bus support, required for some 10/100 NICs
+controller	miibus0
+
 # PCI Ethernet NICs.
 device		al0		# ADMtek AL981 (``Comet'')
 device		ax0		# ASIX AX88140A
 device		de0		# DEC/Intel DC21x4x (``Tulip'')
+device		dm0		# Davicom DM9100/DM9102
 device		fxp0		# Intel EtherExpress PRO/100B (82557, 82558)
 device		mx0		# Macronix 98713/98715/98725 (``PMAC'')
 device		pn0		# Lite-On 82c168/82c169 (``PNIC'')
 device		rl0		# RealTek 8129/8139
+device		sf0		# Adaptec AIC-6915 (``Starfire'')
+device		sis0		# Silicon Integrated Systems SiS 900/SiS 7016
+device		ste0		# Sundance ST201 (D-Link DFE-550TX)
 device		tl0		# Texas Instruments ThunderLAN
 device		tx0		# SMC 9432TX (83c170 ``EPIC'')
 device		vr0		# VIA Rhine, Rhine II
@@ -191,13 +202,13 @@ pseudo-device	loop		# Network loopback
 pseudo-device	ether		# Ethernet support
 pseudo-device	sl	1	# Kernel SLIP
 pseudo-device	ppp	1	# Kernel PPP
-pseudo-device	tun		# Packet tunnel, for ppp(1)
+pseudo-device	tun		# Packet tunnel.
 pseudo-device	pty		# Pseudo-ttys (telnet etc)
 pseudo-device	gzip		# Exec gzipped a.out's
 
 # The `bpf' pseudo-device enables the Berkeley Packet Filter.
-# Be aware of the legal and administrative consequences of enabling this!
-#pseudo-device	bpf		#Berkeley packet filter
+# Be aware of the administrative consequences of enabling this!
+pseudo-device	bpf		#Berkeley packet filter
 
 # USB support
 #controller	uhci0		# UHCI PCI->USB interface