From 99f2863e9598bd41d9ff2e43b6b6cbc29db101d8 Mon Sep 17 00:00:00 2001
From: dogcow <dogcow@NetBSD.org>
Date: Tue, 6 Nov 2007 12:32:12 +0000
Subject: [PATCH] on NetBSD, cardbus_intr_establish's fifth arg's is a symbol
 which returns an int, not a void; change fwohci_intr accordingly.

---
 sys/dev/ieee1394/fwohci.c    | 17 ++++++-----------
 sys/dev/ieee1394/fwohcivar.h |  4 ++--
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/sys/dev/ieee1394/fwohci.c b/sys/dev/ieee1394/fwohci.c
index 95cec4faac40..11166a6e59c1 100644
--- a/sys/dev/ieee1394/fwohci.c
+++ b/sys/dev/ieee1394/fwohci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fwohci.c,v 1.110 2007/11/05 19:08:56 kiyohara Exp $	*/
+/*	$NetBSD: fwohci.c,v 1.111 2007/11/06 12:32:12 dogcow Exp $	*/
 
 /*-
  * Copyright (c) 2003 Hidetoshi Shimokawa
@@ -57,16 +57,10 @@
 #include <sys/endian.h>
 #include <sys/kdb.h>
 
-<<<<<<< fwohci.c
-#include <machine/bus.h>
-=======
+#include <sys/bus.h>
 #include <sys/cdefs.h>
-<<<<<<< fwohci.c
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.110 2007/11/05 19:08:56 kiyohara Exp $");
->>>>>>> 1.108
-=======
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.110 2007/11/05 19:08:56 kiyohara Exp $");
->>>>>>> 1.109
+
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.111 2007/11/06 12:32:12 dogcow Exp $");
 
 #if defined(__DragonFly__) || __FreeBSD_version < 500000
 #include <machine/clock.h>		/* for DELAY() */
@@ -2222,12 +2216,13 @@ fwohci_filt(void *arg)
 	return (fwohci_check_stat(sc));
 }
 
-void
+int
 fwohci_intr(void *arg)
 {
 
 	fwohci_filt(arg);
 	CTR0(KTR_DEV, "fwohci_intr end");
+	return 0;
 }
 
 void
diff --git a/sys/dev/ieee1394/fwohcivar.h b/sys/dev/ieee1394/fwohcivar.h
index f87973fb43b5..b6ec14b0d287 100644
--- a/sys/dev/ieee1394/fwohcivar.h
+++ b/sys/dev/ieee1394/fwohcivar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: fwohcivar.h,v 1.27 2007/11/05 19:08:57 kiyohara Exp $	*/
+/*	$NetBSD: fwohcivar.h,v 1.28 2007/11/06 12:32:12 dogcow Exp $	*/
 
 /*-
  * Copyright (c) 2003 Hidetoshi SHimokawa
@@ -85,7 +85,7 @@ typedef struct fwohci_softc {
 	int cycle_lost;
 } fwohci_softc_t;
 
-void fwohci_intr (void *arg);
+int fwohci_intr (void *arg);
 int fwohci_filt (void *arg);
 int fwohci_init (struct fwohci_softc *, device_t);
 void fwohci_poll (struct firewire_comm *, int, int);