From 017e602c0c30ddc3a16d0587a4b48d5c1f2b0031 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Sat, 8 Apr 1995 16:08:35 +0000 Subject: [PATCH] pca: change IO_PPI to IO_TIMER1 due to syscons conflict --- sys/conf/NOTES | 4 ++-- sys/i386/conf/LINT | 4 ++-- sys/i386/conf/NOTES | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 72304de47103..062602007ce2 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.164 1995/04/08 09:36:02 phk Exp $ +# $Id: LINT,v 1.165 1995/04/08 15:44:18 joerg 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 @@ -598,7 +598,7 @@ device mpu0 at isa? port 0x330 irq 6 drq 0 # 6850 UART Midi device uart0 at isa? port 0x330 irq 5 vector "m6850intr" -device pca0 at isa? port IO_PPI tty +device pca0 at isa? port IO_TIMER1 tty # # Miscellaneous hardware: `mcd', `wt', `ctx', `apm' diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 72304de47103..062602007ce2 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.164 1995/04/08 09:36:02 phk Exp $ +# $Id: LINT,v 1.165 1995/04/08 15:44:18 joerg 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 @@ -598,7 +598,7 @@ device mpu0 at isa? port 0x330 irq 6 drq 0 # 6850 UART Midi device uart0 at isa? port 0x330 irq 5 vector "m6850intr" -device pca0 at isa? port IO_PPI tty +device pca0 at isa? port IO_TIMER1 tty # # Miscellaneous hardware: `mcd', `wt', `ctx', `apm' diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 72304de47103..062602007ce2 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.164 1995/04/08 09:36:02 phk Exp $ +# $Id: LINT,v 1.165 1995/04/08 15:44:18 joerg 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 @@ -598,7 +598,7 @@ device mpu0 at isa? port 0x330 irq 6 drq 0 # 6850 UART Midi device uart0 at isa? port 0x330 irq 5 vector "m6850intr" -device pca0 at isa? port IO_PPI tty +device pca0 at isa? port IO_TIMER1 tty # # Miscellaneous hardware: `mcd', `wt', `ctx', `apm'