From db7b02e8dc6339881c0b7413813f8623def4e367 Mon Sep 17 00:00:00 2001 From: kato Date: Mon, 27 Oct 1997 10:57:58 +0000 Subject: Synchronize with sys/i386/conf/GENERIC and majors.i386 revisions 1.99 and 1.19, respectively. --- sys/pc98/conf/GENERIC | 8 ++++---- sys/pc98/conf/GENERIC98 | 8 ++++---- sys/pc98/conf/majors.pc98 | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'sys/pc98/conf') diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 2740116..1eebbda 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC98,v 1.23 1997/06/15 16:38:12 kato Exp $ +# $Id: GENERIC98,v 1.24 1997/10/14 14:58:18 kato Exp $ # GENERIC98 -- Generic PC98 machine with WD/SCSI disks @@ -133,9 +133,9 @@ device npx0 at isa? port "IO_NPX" irq 8 vector npxintr device apm0 at isa? disable flags 0x31 # Advanced Power Management # PCCARD (PCMCIA) support -#controller crd0 -#device pcic0 at crd? -#device pcic1 at crd? +#controller card0 +#device pcic0 at card? +#device pcic1 at card? device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr device sio1 at isa? port 0xd2 tty irq 5 flags 0x101 vector siointr diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98 index 2740116..1eebbda 100644 --- a/sys/pc98/conf/GENERIC98 +++ b/sys/pc98/conf/GENERIC98 @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC98,v 1.23 1997/06/15 16:38:12 kato Exp $ +# $Id: GENERIC98,v 1.24 1997/10/14 14:58:18 kato Exp $ # GENERIC98 -- Generic PC98 machine with WD/SCSI disks @@ -133,9 +133,9 @@ device npx0 at isa? port "IO_NPX" irq 8 vector npxintr device apm0 at isa? disable flags 0x31 # Advanced Power Management # PCCARD (PCMCIA) support -#controller crd0 -#device pcic0 at crd? -#device pcic1 at crd? +#controller card0 +#device pcic0 at card? +#device pcic1 at card? device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr device sio1 at isa? port 0xd2 tty irq 5 flags 0x101 vector siointr diff --git a/sys/pc98/conf/majors.pc98 b/sys/pc98/conf/majors.pc98 index c381d4a..b7eb0ec 100644 --- a/sys/pc98/conf/majors.pc98 +++ b/sys/pc98/conf/majors.pc98 @@ -1,4 +1,4 @@ -$Id: majors.pc98,v 1.13 1997/08/28 14:21:12 kato Exp $ +$Id: majors.pc98,v 1.14 1997/09/24 08:20:33 kato Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. @@ -88,7 +88,7 @@ chrdev name comments 47 gsc Genius Scanner 48 cy Cyclades 49 ssc SCSI super device -50 crd pcmcia cards +50 card pcmcia cards 51 joy joystick 52 tun IP tunnel device 53 snp tty snoop -- cgit v1.1