Fix comments, whitespace to reduce diffs between this and GENERIC.

1 files changed, 12 insertions, 8 deletions

diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD
index d55c58e..5619d8c 100644
--- a/sys/i386/conf/NEWCARD
+++ b/sys/i386/conf/NEWCARD
@@ -8,7 +8,7 @@
 # USE THIS CODE AT YOUR OWN RISK.  IT IS EXPERIMENTAL AND WILL LIKELY NOT
 # EVEN COMPILE FOR A WHILE.  YOU HAVE BEEN WARNED. -- imp
 #
-# CURRENT STATUS OF CODE: NOT WORKING.  Use PCCARD instead.
+# CURRENT STATUS OF CODE: NOT WORKING.
 #
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
@@ -58,7 +58,7 @@ options 	KTRACE			#ktrace(1) support
 options 	SYSVSHM			#SYSV-style shared memory
 options 	SYSVMSG			#SYSV-style message queues
 options 	SYSVSEM			#SYSV-style semaphores
-options 	P1003_1B		#Posix P1003_1B real-time extentions
+options 	P1003_1B		#Posix P1003_1B real-time extensions
 options 	_KPOSIX_PRIORITY_SCHEDULING
 options		ICMP_BANDLIM		#Rate limit bad replies
 
@@ -133,7 +133,7 @@ pseudo-device	splash
 # syscons is the default console driver, resembling an SCO console
 device		sc0	at isa?
 
-# Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
+# Enable this for the pcvt (VT220 compatible) console driver
 #device		vt0	at isa?
 #options 	XSERVER			# support for X server on a vt console
 #options 	FAT_CURSOR		# start with block cursor
@@ -147,7 +147,7 @@ device		npx0	at nexus? port IO_NPX irq 13
 device		apm0    at nexus? flags 0x20 # Advanced Power Management
 
 # PCCARD (PCMCIA) support
-device		pcic0	at isa? port 0x3e0 irq 10 iomem 0xd0000
+device		pcic0	at isa? irq 10 port 0x3e0 iomem 0xd0000
 #device		pccbb
 
 # Serial (COM) ports
@@ -164,6 +164,7 @@ device		plip		# TCP/IP over parallel
 device		ppi		# Parallel port interface device
 #device		vpo		# Requires scbus and da
 
+
 # PCI Ethernet NICs.
 device		de		# DEC/Intel DC21x4x (``Tulip'')
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
@@ -197,6 +198,8 @@ device		wi
 # card for a manually chosen I/O address and IRQ, you must specify
 # those paremeters here.
 device		an
+# BayStack 660 and others
+#device		awi
 # The probe order of these is presently determined by i386/isa/isa_compat.c.
 #device		ie0	at isa? port 0x300 irq 10 iomem 0xd0000
 #device		fe0	at isa? port 0x300
@@ -204,9 +207,8 @@ device		an
 #device		lnc0	at isa? port 0x280 irq 10 drq 0
 #device		cs0	at isa? port 0x300
 device		sn0	at isa? port 0x300 irq 10
-# requires PCCARD (PCMCIA) support to be activated
-# XXX BROKEN
-#device		xe0	at isa? port? irq ?
+# Disabled because it is currently broken.
+#device		xe
 
 # Pseudo devices - the number indicates how many units to allocated.
 pseudo-device	loop		# Network loopback
@@ -221,7 +223,7 @@ pseudo-device	faith	1	# IPv6-to-IPv4 relaying (translation)
 
 # The `bpf' pseudo-device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
-pseudo-device	bpf		#Berkeley packet filter
+pseudo-device	bpf		# Berkeley packet filter
 
 # USB support
 #device		uhci		# UHCI PCI->USB interface
@@ -233,6 +235,8 @@ pseudo-device	bpf		#Berkeley packet filter
 #device		ulpt		# Printer
 #device		umass		# Disks/Mass storage - Requires scbus and da
 #device		ums		# Mouse
+#device		urio		# Diamond Rio 500 MP3 player
+# USB Ethernet, requires mii
 #device		aue		# ADMtek USB ethernet
 #device		cue		# CATC USB ethernet
 #device		kue		# Kawasaki LSI USB ethernet