diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-11-24 20:23:50 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-11-24 20:23:50 +0000 |
commit | 1478658d13a916e1364d6f5eaf31e34a110d719e (patch) | |
tree | f8f8d67d05700245652fa1d3d781e2a7aecf39f2 /sys/arch/amiga/dev/grf_rh.c | |
parent | 16ba4020a4a59e03b7664dbe41ee6d8e2b365d23 (diff) |
extern decl of cfdata from device.h conflicted with static one in-here
Diffstat (limited to 'sys/arch/amiga/dev/grf_rh.c')
-rw-r--r-- | sys/arch/amiga/dev/grf_rh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amiga/dev/grf_rh.c b/sys/arch/amiga/dev/grf_rh.c index 9044229085f..180929648d1 100644 --- a/sys/arch/amiga/dev/grf_rh.c +++ b/sys/arch/amiga/dev/grf_rh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_rh.c,v 1.10 1996/11/23 21:45:15 kstailey Exp $ */ +/* $OpenBSD: grf_rh.c,v 1.11 1996/11/24 20:23:47 niklas Exp $ */ /* $NetBSD: grf_rh.c,v 1.17.4.3 1996/09/06 00:40:22 jtc Exp $ */ /* @@ -1536,7 +1536,7 @@ struct cfdriver grfrh_cd = { NULL, "grfrh", DV_DULL, NULL, 0 }; -static struct cfdata *cfdata; +static struct cfdata *grfrh_cfdata; int grfrhmatch(pdp, match, auxp) @@ -1571,7 +1571,7 @@ grfrhmatch(pdp, match, auxp) #ifdef RETINACONSOLE if (amiga_realconfig == 0) { rhconunit = cfp->cf_unit; - cfdata = cfp; + grfrh_cfdata = cfp; } } #endif @@ -1614,7 +1614,7 @@ grfrhattach(pdp, dp, auxp) /* * attach grf */ - amiga_config_found(cfdata, &gp->g_device, gp, grfrhprint); + amiga_config_found(grfrh_cfdata, &gp->g_device, gp, grfrhprint); } int |