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_cc.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_cc.c')
| -rw-r--r-- | sys/arch/amiga/dev/grf_cc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amiga/dev/grf_cc.c b/sys/arch/amiga/dev/grf_cc.c index 0e9e409a3c0..94b68bfb9d3 100644 --- a/sys/arch/amiga/dev/grf_cc.c +++ b/sys/arch/amiga/dev/grf_cc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_cc.c,v 1.4 1996/11/23 21:45:10 kstailey Exp $ */ +/* $OpenBSD: grf_cc.c,v 1.5 1996/11/24 20:23:41 niklas Exp $ */ /* $NetBSD: grf_cc.c,v 1.19 1996/04/21 21:11:08 veego Exp $ */ /* @@ -77,7 +77,7 @@ struct cfdriver grfcc_cd = { /* * only used in console init */ -static struct cfdata *cfdata; +static struct cfdata *grfcc_cfdata; /* * we make sure to only init things once. this is somewhat @@ -110,7 +110,7 @@ grfccmatch(pdp, match, auxp) return(0); if (amiga_realconfig == 0) { ccconunit = cfp->cf_unit; - cfdata = cfp; + grfcc_cfdata = cfp; } } return(1); @@ -152,7 +152,7 @@ grfccattach(pdp, dp, auxp) /* * attach grf */ - amiga_config_found(cfdata, &gp->g_device, gp, grfccprint); + amiga_config_found(grfcc_cfdata, &gp->g_device, gp, grfccprint); } int |