From 8e4115484c65834f993943d7f2f08c36ab504fa7 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Tue, 3 Oct 1995 01:12:59 +0000 Subject: [PATCH] Whoops, I misunderstood this. IRQ *12* is a better GUS default. --- sys/conf/NOTES | 6 +++--- sys/i386/conf/LINT | 6 +++--- sys/i386/conf/NOTES | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 13797420efbb..7341e3698d7c 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.201 1995/09/23 08:52:30 peter Exp $ +# $Id: LINT,v 1.203 1995/09/27 19:12:20 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 @@ -649,8 +649,8 @@ 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 sbmidi0 at isa? port 0x330 -device gus0 at isa? port 0x220 irq 10 drq 1 vector gusintr -#device gus0 at isa? port 0x220 irq 10 drq 1 flags 0x3 vector gusintr +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 device opl0 at isa? port 0x388 conflicts device mpu0 at isa? port 0x330 irq 6 drq 0 diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 13797420efbb..7341e3698d7c 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.201 1995/09/23 08:52:30 peter Exp $ +# $Id: LINT,v 1.203 1995/09/27 19:12:20 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 @@ -649,8 +649,8 @@ 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 sbmidi0 at isa? port 0x330 -device gus0 at isa? port 0x220 irq 10 drq 1 vector gusintr -#device gus0 at isa? port 0x220 irq 10 drq 1 flags 0x3 vector gusintr +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 device opl0 at isa? port 0x388 conflicts device mpu0 at isa? port 0x330 irq 6 drq 0 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 13797420efbb..7341e3698d7c 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.201 1995/09/23 08:52:30 peter Exp $ +# $Id: LINT,v 1.203 1995/09/27 19:12:20 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 @@ -649,8 +649,8 @@ 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 sbmidi0 at isa? port 0x330 -device gus0 at isa? port 0x220 irq 10 drq 1 vector gusintr -#device gus0 at isa? port 0x220 irq 10 drq 1 flags 0x3 vector gusintr +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 device opl0 at isa? port 0x388 conflicts device mpu0 at isa? port 0x330 irq 6 drq 0