diff options
| author | nate <nate@FreeBSD.org> | 1996-04-18 04:02:30 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1996-04-18 04:02:30 +0000 |
| commit | 35e568fc938e5580c800091f56f26b3ffcdcae5b (patch) | |
| tree | 8ae9768eb65a7c16e662cedd5ca2b656a8631267 | |
| parent | 0b01ed2e48d62718ca3f2df1b476f4599ee5971d (diff) | |
| download | FreeBSD-src-35e568fc938e5580c800091f56f26b3ffcdcae5b.zip FreeBSD-src-35e568fc938e5580c800091f56f26b3ffcdcae5b.tar.gz | |
Added a disabled psm0 (PS/2) mouse device, using the new 'disable'
keyword.
| -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 33cc983..350cdd7 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.64 1996/04/09 09:00:41 jkh Exp $ +# $Id: GENERIC,v 1.65 1996/04/10 23:03:36 jkh Exp $ # machine "i386" @@ -102,6 +102,8 @@ device lpt1 at isa? port? tty device lpt2 at isa? port? tty device mse0 at isa? port 0x23c tty irq 5 vector mseintr +device psm0 at isa? disable port "IO_KBD" conflicts tty irq 12 vector psmintr + # Order is important here due to intrusive probes, do *not* alphabetize # this list of network interfaces until the probes have been fixed. # Right now it appears that the ie0 must be probed before ep0. See diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 33cc983..350cdd7 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.64 1996/04/09 09:00:41 jkh Exp $ +# $Id: GENERIC,v 1.65 1996/04/10 23:03:36 jkh Exp $ # machine "i386" @@ -102,6 +102,8 @@ device lpt1 at isa? port? tty device lpt2 at isa? port? tty device mse0 at isa? port 0x23c tty irq 5 vector mseintr +device psm0 at isa? disable port "IO_KBD" conflicts tty irq 12 vector psmintr + # Order is important here due to intrusive probes, do *not* alphabetize # this list of network interfaces until the probes have been fixed. # Right now it appears that the ie0 must be probed before ep0. See |
