Merged from sys/i386/conf/GENERIC.hints revision 1.6 and 1.7.

1 files changed, 16 insertions, 16 deletions

diff --git a/sys/pc98/conf/GENERIC.hints b/sys/pc98/conf/GENERIC.hints
index 21114d0..540bcc6 100644
--- a/sys/pc98/conf/GENERIC.hints
+++ b/sys/pc98/conf/GENERIC.hints
@@ -82,11 +82,24 @@ hint.npx.0.irq="8"
 #hint.apm.0.at="nexus"
 #hint.apm.0.disabled="1"
 #hint.apm.0.flags="0x20"
+#hint.pmtimer.0.at="isa"
 
 hint.pcic.0.at="isa"
 #hint.pcic.0.irq="6"	# Default to polling
 hint.pcic.0.port="0x3e0"
 
+# Windows Sound System
+hint.pcm.0.at="isa"
+hint.pcm.0.port="0xf40"
+hint.pcm.0.irq="12"
+hint.pcm.0.drq="1"
+hint.pcm.0.flags="0x10000"
+# Sound Blaster 16
+#hint.sbc.0.at="isa"
+#hint.sbc.0.port="0x20d2"
+#hint.sbc.0.irq="10"
+#hint.sbc.0.drq="3"
+
 # COM1
 hint.sio.0.at="isa"
 hint.sio.0.port="0x030"
@@ -150,6 +163,9 @@ hint.mse.0.at="isa"
 hint.mse.0.port="0x7FD9"
 hint.mse.0.irq="13"
 
+#hint.joy.0.at="isa"
+#hint.joy.0.port="0x04d2"
+
 hint.ppc.0.at="isa"
 hint.ppc.0.irq="14"
 hint.olpt.0.at="isa"
@@ -275,19 +291,3 @@ hint.snc.0.at="isa"
 hint.snc.0.port="0x888"
 hint.snc.0.irq="6"
 hint.snc.0.maddr="0xc0000"
-
-#hint.joy.0.at="isa"
-#hint.joy.0.port="0x04d2"
-
-# Windows Sound System
-#hint.pcm.0.at="isa"
-#hint.pcm.0.port="0xf40"
-#hint.pcm.0.irq="12"
-#hint.pcm.0.drq="1"
-#hint.pcm.0.flags="0x10000"
-# Sound Blaster 16
-#hint.sbc.0.at="isa"
-#hint.sbc.0.port="0x20d2"
-#hint.sbc.0.irq="10"
-#hint.sbc.0.drq="3"
-