diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index ecb9e3f3017e..6097be2447cb 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.320 1997/03/23 11:08:28 kato Exp $
+#	$Id: LINT,v 1.321 1997/03/25 03:38:33 ache 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
@@ -843,10 +843,7 @@ device sbmidi0  at isa? port 0x330
 device gus0 at isa? port 0x220 irq 12 drq 1 vector gusintr
 #device gus0 at isa? port 0x220 irq 12 drq 1 flags 0x3 vector gusintr
 device mss0 at isa? port 0x530 irq 10 drq 1 vector adintr
-# Use this line for PAS avoid port conflict
-device opl0     at isa? port 0x38a
-# For normal case use next line
-# device opl0     at isa? port 0x388
+device opl0     at isa? port 0x388 conflicts
 device mpu0     at isa? port 0x330 irq 6 drq 0
 device uart0 at isa? port 0x330 irq 5 vector "m6850intr"
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index ecb9e3f3017e..6097be2447cb 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -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.320 1997/03/23 11:08:28 kato Exp $
+#	$Id: LINT,v 1.321 1997/03/25 03:38:33 ache 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
@@ -843,10 +843,7 @@ device sbmidi0  at isa? port 0x330
 device gus0 at isa? port 0x220 irq 12 drq 1 vector gusintr
 #device gus0 at isa? port 0x220 irq 12 drq 1 flags 0x3 vector gusintr
 device mss0 at isa? port 0x530 irq 10 drq 1 vector adintr
-# Use this line for PAS avoid port conflict
-device opl0     at isa? port 0x38a
-# For normal case use next line
-# device opl0     at isa? port 0x388
+device opl0     at isa? port 0x388 conflicts
 device mpu0     at isa? port 0x330 irq 6 drq 0
 device uart0 at isa? port 0x330 irq 5 vector "m6850intr"
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index ecb9e3f3017e..6097be2447cb 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/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.320 1997/03/23 11:08:28 kato Exp $
+#	$Id: LINT,v 1.321 1997/03/25 03:38:33 ache 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
@@ -843,10 +843,7 @@ device sbmidi0  at isa? port 0x330
 device gus0 at isa? port 0x220 irq 12 drq 1 vector gusintr
 #device gus0 at isa? port 0x220 irq 12 drq 1 flags 0x3 vector gusintr
 device mss0 at isa? port 0x530 irq 10 drq 1 vector adintr
-# Use this line for PAS avoid port conflict
-device opl0     at isa? port 0x38a
-# For normal case use next line
-# device opl0     at isa? port 0x388
+device opl0     at isa? port 0x388 conflicts
 device mpu0     at isa? port 0x330 irq 6 drq 0
 device uart0 at isa? port 0x330 irq 5 vector "m6850intr"