diff options
author | ache <ache@FreeBSD.org> | 1997-03-26 17:46:03 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 1997-03-26 17:46:03 +0000 |
commit | 3e779d8c7bca14b4b7e37105dc95c3eec41a2d73 (patch) | |
tree | b4ed6fe622c50a6c2b45bb7c9c41a2c00386adbf /sys/conf | |
parent | e3fc34456c5460d689a92df12163b6fa4a2b81e0 (diff) | |
download | FreeBSD-src-3e779d8c7bca14b4b7e37105dc95c3eec41a2d73.zip FreeBSD-src-3e779d8c7bca14b4b7e37105dc95c3eec41a2d73.tar.gz |
Add "conflicts" to sbmidi0 since configured irq passed back to isa
and conflict with sb0 irq.
NOTE: existen configurations require "conflicts" adding to sbmidi0 now
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/NOTES | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index bc7b7e1..1d21dfa 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.322 1997/03/26 16:10:43 ache Exp $ +# $Id: LINT,v 1.323 1997/03/26 17:20:24 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 @@ -838,7 +838,7 @@ controller snd0 device pas0 at isa? port 0x388 irq 10 drq 6 vector pasintr device sb0 at isa? port 0x220 irq 5 conflicts drq 1 vector sbintr device sbxvi0 at isa? port? irq? drq 5 conflicts -device sbmidi0 at isa? port 0x330 +device sbmidi0 at isa? port 0x330 irq? conflicts #device awe0 at isa? port 0x620 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 |