Merge from sys/i386/conf/GENERIC revision 1.231, 1.232 and 1.235.

2 files changed, 18 insertions, 22 deletions

diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 43dce4c..1261fc6 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -1,5 +1,5 @@
 #
-# GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
+# GENERIC -- Generic kernel configuration file for FreeBSD/pc98
 #
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
@@ -17,8 +17,6 @@
 #
 # $FreeBSD$
 
-# GENERIC98 -- Generic PC98 machine with WD/SCSI disks
-
 machine		pc98
 cpu		I386_CPU
 cpu		I486_CPU
@@ -43,7 +41,7 @@ options 	CD9660			#ISO 9660 Filesystem
 options 	CD9660_ROOT		#CD-ROM usable as root, CD9660 required
 options 	PROCFS			#Process filesystem
 options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options 	SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
+options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI
 options 	EPSON_BOUNCEDMA		#use bounce buufer for 15-16M
 #options 	EPSON_MEMWIN		#EPSON memory window support
 options 	UCONSOLE		#Allow users to grab the console
@@ -182,11 +180,11 @@ device		mse0	at isa? port IO_MSE irq 13
 
 # NEW Parallel port
 device		ppc0	at isa? irq 14
-device		ppbus			# Parallel port bus (required)
-device		lpt			# Printer
-device		plip			# TCP/IP over parallel
-device		ppi			# Parallel port interface device
-#device		vpo			# Requires scbus and da0
+device		ppbus		# Parallel port bus (required)
+device		lpt		# Printer
+device		plip		# TCP/IP over parallel
+device		ppi		# Parallel port interface device
+#device		vpo		# Requires scbus and da
 # OLD Parallel port
 # Please stay olpt driver after ppc driver
 device		olpt0	at isa? port IO_LPT
@@ -259,14 +257,14 @@ device		lnc0	at isa? port 0x03d0 irq 6
 # WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really
 # exists only as a PCMCIA device, so there is no ISA attatement needed
 # and resources will always be dynamically assigned by the pccard code.
-#device		wi
+device		wi
 
 # Aironet 4500/4800 802.11 wireless NICs. Note: the declaration below will
 # work for PCMCIA and PCI cards, as well as ISA cards set to ISA PnP
 # mode (the factory default). If you set the switches on your ISA
 # card for a manually chosen I/O address and IRQ, you must specify
 # those paremeters here.
-# device	an
+device		an
 
 # requires PCCARD (PCMCIA) support to be activated
 device		sn
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index 43dce4c..1261fc6 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -1,5 +1,5 @@
 #
-# GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
+# GENERIC -- Generic kernel configuration file for FreeBSD/pc98
 #
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
@@ -17,8 +17,6 @@
 #
 # $FreeBSD$
 
-# GENERIC98 -- Generic PC98 machine with WD/SCSI disks
-
 machine		pc98
 cpu		I386_CPU
 cpu		I486_CPU
@@ -43,7 +41,7 @@ options 	CD9660			#ISO 9660 Filesystem
 options 	CD9660_ROOT		#CD-ROM usable as root, CD9660 required
 options 	PROCFS			#Process filesystem
 options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options 	SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
+options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI
 options 	EPSON_BOUNCEDMA		#use bounce buufer for 15-16M
 #options 	EPSON_MEMWIN		#EPSON memory window support
 options 	UCONSOLE		#Allow users to grab the console
@@ -182,11 +180,11 @@ device		mse0	at isa? port IO_MSE irq 13
 
 # NEW Parallel port
 device		ppc0	at isa? irq 14
-device		ppbus			# Parallel port bus (required)
-device		lpt			# Printer
-device		plip			# TCP/IP over parallel
-device		ppi			# Parallel port interface device
-#device		vpo			# Requires scbus and da0
+device		ppbus		# Parallel port bus (required)
+device		lpt		# Printer
+device		plip		# TCP/IP over parallel
+device		ppi		# Parallel port interface device
+#device		vpo		# Requires scbus and da
 # OLD Parallel port
 # Please stay olpt driver after ppc driver
 device		olpt0	at isa? port IO_LPT
@@ -259,14 +257,14 @@ device		lnc0	at isa? port 0x03d0 irq 6
 # WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really
 # exists only as a PCMCIA device, so there is no ISA attatement needed
 # and resources will always be dynamically assigned by the pccard code.
-#device		wi
+device		wi
 
 # Aironet 4500/4800 802.11 wireless NICs. Note: the declaration below will
 # work for PCMCIA and PCI cards, as well as ISA cards set to ISA PnP
 # mode (the factory default). If you set the switches on your ISA
 # card for a manually chosen I/O address and IRQ, you must specify
 # those paremeters here.
-# device	an
+device		an
 
 # requires PCCARD (PCMCIA) support to be activated
 device		sn