[src/netbsd-1-5]: src/sys/arch/mvme68k/dev Pullup from trunk: 1.3 - 1.4

[scw <scw%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/95da8f6b420c
branches:  netbsd-1-5
changeset: 488292:95da8f6b420c
user:      scw <scw%NetBSD.org@localhost>
date:      Tue Jun 27 20:09:33 2000 +0000

description:
Pullup from trunk: 1.3 - 1.4
Approved by: thorpej

Fix some prototype tyops introduced when the generic event counting
code was added.

diffstat:

 sys/arch/mvme68k/dev/vme_two.c    |  5 ++---
 sys/arch/mvme68k/dev/vme_twovar.h |  4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 0b59ed7a5727 -r 95da8f6b420c sys/arch/mvme68k/dev/vme_two.c
--- a/sys/arch/mvme68k/dev/vme_two.c    Tue Jun 27 19:45:54 2000 +0000
+++ b/sys/arch/mvme68k/dev/vme_two.c    Tue Jun 27 20:09:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vme_two.c,v 1.3 2000/06/04 19:14:50 cgd Exp $ */
+/*     $NetBSD: vme_two.c,v 1.3.2.1 2000/06/27 20:09:33 scw Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -89,7 +89,6 @@
 void vmetwo_master_range __P((struct vmetwo_softc *, int,
                              struct vmetwo_range *));
 int vmetwo_local_isr_trampoline __P((void *));
-const struct evcnt *vmetwo_intr_evcnt __P((struct vmetwo_softc *, int));
 void vmetwo_intr_establish __P((struct vmetwo_softc *, int, int,
                              int (*) (void *), void *));
 void vmetwo_intr_disestablish __P((struct vmetwo_softc *, int, int));
@@ -565,7 +564,7 @@
 }
 
 const struct evcnt *
-_vmetwo_intr_establish(vsc, handle, prior, func, arg)
+_vmetwo_intr_evcnt(vsc, handle)
        void *vsc;
        vme_intr_handle_t handle;
 {
diff -r 0b59ed7a5727 -r 95da8f6b420c sys/arch/mvme68k/dev/vme_twovar.h
--- a/sys/arch/mvme68k/dev/vme_twovar.h Tue Jun 27 19:45:54 2000 +0000
+++ b/sys/arch/mvme68k/dev/vme_twovar.h Tue Jun 27 20:09:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vme_twovar.h,v 1.3 2000/06/04 19:14:51 cgd Exp $ */
+/*     $NetBSD: vme_twovar.h,v 1.3.2.1 2000/06/27 20:10:05 scw Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
 
 int _vmetwo_intmap __P((void *, int, int, vme_intr_handle_t *));
 
-const struct evcnt *_vmetwo_intr_establish __P((void *, vme_intr_handle_t));
+const struct evcnt *_vmetwo_intr_evcnt __P((void *, vme_intr_handle_t));
 
 void *_vmetwo_intr_establish __P((void *, vme_intr_handle_t, int,
     int (*)(void *), void *));