diff options
| author | jkh <jkh@FreeBSD.org> | 1996-07-11 11:18:45 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-07-11 11:18:45 +0000 |
| commit | 3c83c32022ac3eaa388e186fb8285500596cff48 (patch) | |
| tree | a1079624f19a3e390497419095c1aaccc391ee71 | |
| parent | eef290ac5fcb42cac4a669993e6af1ea6d4ce8b9 (diff) | |
| download | FreeBSD-src-3c83c32022ac3eaa388e186fb8285500596cff48.zip FreeBSD-src-3c83c32022ac3eaa388e186fb8285500596cff48.tar.gz | |
Merge.
| -rw-r--r-- | sys/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 73e8024..f426b7c 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -1,7 +1,7 @@ # # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks # -# $Id: GENERIC,v 1.72 1996/06/30 09:39:29 joerg Exp $ +# $Id: GENERIC,v 1.73 1996/07/10 03:35:59 jkh Exp $ # machine "i386" @@ -104,6 +104,8 @@ options APM_BROKEN_STATCLOCK # Workaround some buggy APM BIOS device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr +device sio2 at isa? disable port "IO_COM3" tty irq 5 vector siointr +device sio3 at isa? disable port "IO_COM4" tty irq 9 vector siointr device lpt0 at isa? port? tty irq 7 vector lptintr device lpt1 at isa? port? tty diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 73e8024..f426b7c 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -1,7 +1,7 @@ # # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks # -# $Id: GENERIC,v 1.72 1996/06/30 09:39:29 joerg Exp $ +# $Id: GENERIC,v 1.73 1996/07/10 03:35:59 jkh Exp $ # machine "i386" @@ -104,6 +104,8 @@ options APM_BROKEN_STATCLOCK # Workaround some buggy APM BIOS device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr +device sio2 at isa? disable port "IO_COM3" tty irq 5 vector siointr +device sio3 at isa? disable port "IO_COM4" tty irq 9 vector siointr device lpt0 at isa? port? tty irq 7 vector lptintr device lpt1 at isa? port? tty |
