diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 365e53315d93..ecb9e3f3017e 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.319 1997/03/20 16:33:15 mpp Exp $ +# $Id: LINT,v 1.320 1997/03/23 11:08:28 kato 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 @@ -836,8 +836,8 @@ device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr # Controls all sound devices controller snd0 device pas0 at isa? port 0x388 irq 10 drq 6 vector pasintr -device sb0 at isa? port 0x220 irq 7 conflicts drq 1 vector sbintr -device sbxvi0 at isa? drq 5 +device sb0 at isa? port 0x220 irq 5 conflicts drq 1 vector sbintr +device sbxvi0 at isa? port? drq 5 device sbmidi0 at isa? port 0x330 #device awe0 at isa? port 0x620 device gus0 at isa? port 0x220 irq 12 drq 1 vector gusintr diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 365e53315d93..ecb9e3f3017e 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.319 1997/03/20 16:33:15 mpp Exp $ +# $Id: LINT,v 1.320 1997/03/23 11:08:28 kato 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 @@ -836,8 +836,8 @@ device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr # Controls all sound devices controller snd0 device pas0 at isa? port 0x388 irq 10 drq 6 vector pasintr -device sb0 at isa? port 0x220 irq 7 conflicts drq 1 vector sbintr -device sbxvi0 at isa? drq 5 +device sb0 at isa? port 0x220 irq 5 conflicts drq 1 vector sbintr +device sbxvi0 at isa? port? drq 5 device sbmidi0 at isa? port 0x330 #device awe0 at isa? port 0x620 device gus0 at isa? port 0x220 irq 12 drq 1 vector gusintr diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 365e53315d93..ecb9e3f3017e 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.319 1997/03/20 16:33:15 mpp Exp $ +# $Id: LINT,v 1.320 1997/03/23 11:08:28 kato 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 @@ -836,8 +836,8 @@ device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr # Controls all sound devices controller snd0 device pas0 at isa? port 0x388 irq 10 drq 6 vector pasintr -device sb0 at isa? port 0x220 irq 7 conflicts drq 1 vector sbintr -device sbxvi0 at isa? drq 5 +device sb0 at isa? port 0x220 irq 5 conflicts drq 1 vector sbintr +device sbxvi0 at isa? port? drq 5 device sbmidi0 at isa? port 0x330 #device awe0 at isa? port 0x620 device gus0 at isa? port 0x220 irq 12 drq 1 vector gusintr