diff options
-rw-r--r-- | sys/arch/amiga/dev/grf_cv.c | 8 | ||||
-rw-r--r-- | sys/arch/amiga/dev/grf_rh.c | 6 | ||||
-rw-r--r-- | sys/arch/amiga/dev/grf_rt.c | 6 | ||||
-rw-r--r-- | sys/arch/amiga/dev/grf_ul.c | 6 |
4 files changed, 14 insertions, 12 deletions
diff --git a/sys/arch/amiga/dev/grf_cv.c b/sys/arch/amiga/dev/grf_cv.c index b7f19ad71de..2c768263984 100644 --- a/sys/arch/amiga/dev/grf_cv.c +++ b/sys/arch/amiga/dev/grf_cv.c @@ -1,5 +1,5 @@ -/* $OpenBSD: grf_cv.c,v 1.8 1996/05/02 06:43:46 niklas Exp $ */ -/* $NetBSD: grf_cv.c,v 1.12 1996/04/21 21:11:15 veego Exp $ */ +/* $OpenBSD: grf_cv.c,v 1.9 1996/05/04 13:54:22 niklas Exp $ */ +/* $NetBSD: grf_cv.c,v 1.13 1996/05/01 09:59:24 veego Exp $ */ /* * Copyright (c) 1995 Michael Teske @@ -307,9 +307,11 @@ grfcvmatch(pdp, match, auxp) struct device *pdp; void *match, *auxp; { +#ifdef CV64CONSOLE struct cfdata *cfp = match; - struct zbus_args *zap; static int cvcons_unit = -1; +#endif + struct zbus_args *zap; zap = auxp; diff --git a/sys/arch/amiga/dev/grf_rh.c b/sys/arch/amiga/dev/grf_rh.c index 77abac737c5..aafc22f54d3 100644 --- a/sys/arch/amiga/dev/grf_rh.c +++ b/sys/arch/amiga/dev/grf_rh.c @@ -1,5 +1,5 @@ -/* $OpenBSD: grf_rh.c,v 1.5 1996/05/02 06:43:48 niklas Exp $ */ -/* $NetBSD: grf_rh.c,v 1.14 1996/04/21 21:11:17 veego Exp $ */ +/* $OpenBSD: grf_rh.c,v 1.6 1996/05/04 13:54:26 niklas Exp $ */ +/* $NetBSD: grf_rh.c,v 1.15 1996/05/01 09:59:26 veego Exp $ */ /* * Copyright (c) 1994 Markus Wild @@ -1436,8 +1436,8 @@ grfrhmatch(pdp, match, auxp) struct device *pdp; void *match, *auxp; { - struct cfdata *cfp = match; #ifdef RETINACONSOLE + struct cfdata *cfp = match; static int rhconunit = -1; #endif struct zbus_args *zap; diff --git a/sys/arch/amiga/dev/grf_rt.c b/sys/arch/amiga/dev/grf_rt.c index 244065e1bfd..a398ab52fd4 100644 --- a/sys/arch/amiga/dev/grf_rt.c +++ b/sys/arch/amiga/dev/grf_rt.c @@ -1,5 +1,5 @@ -/* $OpenBSD: grf_rt.c,v 1.4 1996/05/02 06:43:50 niklas Exp $ */ -/* $NetBSD: grf_rt.c,v 1.25 1996/04/21 21:11:21 veego Exp $ */ +/* $OpenBSD: grf_rt.c,v 1.5 1996/05/04 13:54:29 niklas Exp $ */ +/* $NetBSD: grf_rt.c,v 1.26 1996/05/01 09:59:28 veego Exp $ */ /* * Copyright (c) 1993 Markus Wild @@ -802,8 +802,8 @@ grfrtmatch(pdp, match, auxp) struct device *pdp; void *match, *auxp; { - struct cfdata *cfp = match; #ifdef RETINACONSOLE + struct cfdata *cfp = match; static int rtconunit = -1; #endif struct zbus_args *zap; diff --git a/sys/arch/amiga/dev/grf_ul.c b/sys/arch/amiga/dev/grf_ul.c index 71bcf41740e..c67a9c9c428 100644 --- a/sys/arch/amiga/dev/grf_ul.c +++ b/sys/arch/amiga/dev/grf_ul.c @@ -1,5 +1,5 @@ -/* $OpenBSD: grf_ul.c,v 1.7 1996/05/02 06:43:52 niklas Exp $ */ -/* $NetBSD: grf_ul.c,v 1.15 1996/04/21 21:11:24 veego Exp $ */ +/* $OpenBSD: grf_ul.c,v 1.8 1996/05/04 13:54:31 niklas Exp $ */ +/* $NetBSD: grf_ul.c,v 1.16 1996/05/01 09:59:29 veego Exp $ */ #define UL_DEBUG @@ -465,8 +465,8 @@ grfulmatch(pdp, match, auxp) struct device *pdp; void *match, *auxp; { - struct cfdata *cfp = match; #ifdef ULOWELLCONSOLE + struct cfdata *cfp = match; static int ulconunit = -1; #endif struct zbus_args *zap; |