Hook ubt and ubtbcmfw back up to the build.

5 files changed, 15 insertions, 18 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 1e958b829195..b94ebe4f42a1 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1588,11 +1588,6 @@ dev/usb/serial/uvscom.c		optional uvscom
 dev/usb/serial/usb_serial.c 	optional ucom | \
 	(u3g | uark | ubsa | ubser | uchcom | ucycom | ufoma | uftdi | ugensa | uipaq | ulpt | umct | umodem | umoscom | uplcom | uslcom | uvisor | uvscom)
 #
-# USB bluetooth drivers
-#
-dev/usb/bluetooth/ng_ubt.c		optional netgraph_bluetooth_ubt usb
-dev/usb/bluetooth/ubtbcmfw.c		optional netgraph_bluetooth_ubtbcmfw usb
-#
 # USB misc drivers
 #
 dev/usb/misc/ufm.c		optional ufm
@@ -2205,6 +2200,8 @@ netgraph/atm/uni/ng_uni.c	optional ngatm_uni \
 netgraph/bluetooth/common/ng_bluetooth.c optional netgraph_bluetooth
 netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c optional netgraph_bluetooth_bt3c
 netgraph/bluetooth/drivers/h4/ng_h4.c optional netgraph_bluetooth_h4
+netgraph/bluetooth/drivers/ubt/ng_ubt.c optional netgraph_bluetooth_ubt usb
+netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c optional netgraph_bluetooth_ubtbcmfw usb
 netgraph/bluetooth/hci/ng_hci_cmds.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/hci/ng_hci_evnt.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/hci/ng_hci_main.c optional netgraph_bluetooth_hci
diff --git a/sys/modules/netgraph/bluetooth/ubt/Makefile b/sys/modules/netgraph/bluetooth/ubt/Makefile
index b5d3c7f59315..b9ff0c1dcda3 100644
--- a/sys/modules/netgraph/bluetooth/ubt/Makefile
+++ b/sys/modules/netgraph/bluetooth/ubt/Makefile
@@ -1,12 +1,13 @@
 # $Id: Makefile,v 1.2 2003/03/22 23:44:34 max Exp $
 # $FreeBSD$
 
-S=	${.CURDIR}/../../../..
+.PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt
 
-.PATH: $S/dev/usb/bluetooth
+CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include \
+		-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt
 
-KMOD=	ng_ubt
-SRCS=	opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \
-	ng_ubt.c
+KMOD=		ng_ubt
+SRCS=		ng_ubt.c opt_bus.h opt_usb.h device_if.h bus_if.h \
+		usb_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile b/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
index d45ddb14c597..4c5c8131af26 100644
--- a/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
+++ b/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
@@ -1,12 +1,13 @@
 # $Id: Makefile,v 1.1 2003/04/27 00:22:12 max Exp $
 # $FreeBSD$
 
-S=	${.CURDIR}/../../../..
+.PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw
 
-.PATH: $S/dev/usb/bluetooth
+CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include \
+		-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw
 
-KMOD=	ubtbcmfw
-SRCS=	opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h vnode_if.h usbdevs.h \
-	ubtbcmfw.c
+KMOD=		ubtbcmfw
+SRCS=		ubtbcmfw.c opt_bus.h opt_usb.h device_if.h bus_if.h \
+		usb_if.h vnode_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index f35bb9bbe4ad..b7de9e649b33 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -26,7 +26,6 @@
 #
 
 SUBDIR = usb
-#SUBDIR += ubt bluetooth_ng ubtfw
 SUBDIR += ehci musb ohci uhci uss820dci ${_at91dci} ${_atmegadci}
 SUBDIR += rum uath upgt ural zyd
 SUBDIR += uhid ukbd ums udbp ufm
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index 4d97791f9c8c..b140639aca57 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -117,8 +117,7 @@
 #include <netgraph/bluetooth/include/ng_bluetooth.h>
 #include <netgraph/bluetooth/include/ng_hci.h>
 #include <netgraph/bluetooth/include/ng_ubt.h>
-
-#include <dev/usb/bluetooth/ng_ubt_var.h>
+#include <netgraph/bluetooth/drivers/ubt/ng_ubt_var.h>
 
 static int		ubt_modevent(module_t, int, void *);
 static device_probe_t	ubt_probe;