summaryrefslogtreecommitdiff
path: root/sys/arch/amiga/dev/if_ed.c
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-09-18 13:40:05 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-09-18 13:40:05 +0000
commit2157b0ba8b467d175588a39d0235e3f42cfa0167 (patch)
treeab27e576639f38402b47a6af61ab8711d85d7ce7 /sys/arch/amiga/dev/if_ed.c
parent9557efb948677ebfd961c6f49a7b69e3c722c206 (diff)
Merge of NetBSD changes upto last week or so, with the exception of stand/
Diffstat (limited to 'sys/arch/amiga/dev/if_ed.c')
-rw-r--r--sys/arch/amiga/dev/if_ed.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amiga/dev/if_ed.c b/sys/arch/amiga/dev/if_ed.c
index e918ba94219..8244c5d7590 100644
--- a/sys/arch/amiga/dev/if_ed.c
+++ b/sys/arch/amiga/dev/if_ed.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: if_ed.c,v 1.10 1997/02/21 11:08:48 niklas Exp $ */
-/* $NetBSD: if_ed.c,v 1.24 1996/12/23 09:10:16 veego Exp $ */
+/* $OpenBSD: if_ed.c,v 1.11 1997/09/18 13:39:56 niklas Exp $ */
+/* $NetBSD: if_ed.c,v 1.26 1997/03/17 17:51:42 is Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet