diff options
| author | briggs <briggs@cvs.openbsd.org> | 1997-03-12 22:51:43 +0000 |
|---|---|---|
| committer | briggs <briggs@cvs.openbsd.org> | 1997-03-12 22:51:43 +0000 |
| commit | 1db78f17332dff39adfe6e68dba2ccc334c7071a (patch) | |
| tree | 4d9b4709e0a83dcf2d2971bc04ca1726d796fe7e /sys | |
| parent | fb020bd26d9963e441e407675ee1217bfb57d284 (diff) | |
Fix a conflict.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mac68k/dev/z8530tty.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/arch/mac68k/dev/z8530tty.c b/sys/arch/mac68k/dev/z8530tty.c index f32adbd1152..18f74bcb0f8 100644 --- a/sys/arch/mac68k/dev/z8530tty.c +++ b/sys/arch/mac68k/dev/z8530tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530tty.c,v 1.8 1997/03/12 13:36:58 briggs Exp $ */ +/* $OpenBSD: z8530tty.c,v 1.9 1997/03/12 22:51:42 briggs Exp $ */ /* $NetBSD: z8530tty.c,v 1.10 1996/12/18 05:17:44 scottr Exp $ */ /* @@ -124,7 +124,6 @@ zstty_match(parent, vcf, aux) { struct cfdata *cf = (struct cfdata *) vcf; struct zsc_attach_args *args = aux; - struct cfdata *cf = vcf; /* Exact match is better than wildcard. */ if (cf->cf_loc[0] == args->channel) |