From 80ad7275a9d1c8d6523fc2c588857f3544cbf19a Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Fri, 24 Jun 2011 15:19:05 +0000
Subject: [PATCH] Fix the build of the pcnet driver. It should probably be
 updated to the current FreeBSD version though.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42294 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile   | 8 ++++----
 src/add-ons/kernel/drivers/network/pcnet/dev/le/glue.c    | 5 +++++
 .../kernel/drivers/network/pcnet/dev/le/if_le_pci.c       | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile b/src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile
index 0fc54c4cef..172b8e5a64 100644
--- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile
+++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile
@@ -1,11 +1,12 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network pcnet dev le ;
 
-UsePrivateHeaders kernel net ;
-
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
-SubDirCcFlags [ FDefines _KERNEL=1 LEDEBUG=128 ] ;
+UsePrivateHeaders net system ;
+UsePrivateKernelHeaders ;
+
+SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
 
 KernelAddon pcnet :
 	am7990.c
@@ -15,4 +16,3 @@ KernelAddon pcnet :
 	glue.c
 	: libfreebsd_network.a
 	;
-
diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/glue.c b/src/add-ons/kernel/drivers/network/pcnet/dev/le/glue.c
index 291bcfcf4e..e9ffe1faef 100644
--- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/glue.c
+++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/glue.c
@@ -1,6 +1,11 @@
 #include <sys/bus.h>
+#include <sys/mutex.h>
 
 #include <net/ethernet.h>
+#include <net/if.h>
+#include <net/if_media.h>
+
+#include <machine/bus.h>
 
 #include <dev/le/lancereg.h>
 #include <dev/le/lancevar.h>
diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c b/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c
index b2ab023f58..672e12a601 100644
--- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c
+++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c
@@ -455,7 +455,7 @@ le_pci_attach(device_t dev)
 	}
 
 	error = bus_setup_intr(dev, lesc->sc_ires, INTR_TYPE_NET | INTR_MPSAFE,
-	    am79900_intr, sc, &lesc->sc_ih);
+	    NULL, am79900_intr, sc, &lesc->sc_ih);
 	if (error != 0) {
 		device_printf(dev, "cannot set up interrupt\n");
 		goto fail_am79900;