kernel/usb4bsd: Unbreak 'template' module (new file missing in Makefile).
authorSascha Wildner <saw@online.de>
Thu, 12 Mar 2015 21:57:46 +0000 (22:57 +0100)
committerSascha Wildner <saw@online.de>
Thu, 12 Mar 2015 21:58:02 +0000 (22:58 +0100)
sys/bus/u4b/template/Makefile
sys/bus/u4b/template/usb_template_serialnet.c
sys/conf/files

index b9f0cd3..2c2bc2a 100644 (file)
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: head/sys/modules/usb/template/Makefile 223467 2011-06-23 07:54:03Z hselasky $
+# $FreeBSD: head/sys/modules/usb/template/Makefile 277131 2015-01-13 14:26:05Z hselasky $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #
@@ -35,6 +35,7 @@ SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \
        usb_template_mouse.c \
        usb_template_msc.c \
        usb_template_mtp.c \
-       usb_template_phone.c
+       usb_template_phone.c \
+       usb_template_serialnet.c
 
 .include <bsd.kmod.mk>
index beb5e9c..919bd2d 100644 (file)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 #include USB_GLOBAL_INCLUDE_FILE
 #else
 #include <sys/stdint.h>
-#include <sys/stddef.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/types.h>
@@ -50,18 +49,17 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/sysctl.h>
-#include <sys/sx.h>
 #include <sys/unistd.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
 #include <sys/priv.h>
 
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-#include <dev/usb/usb_core.h>
-#include <dev/usb/usb_cdc.h>
+#include <bus/u4b/usb.h>
+#include <bus/u4b/usbdi.h>
+#include <bus/u4b/usb_core.h>
+#include <bus/u4b/usb_cdc.h>
 
-#include <dev/usb/template/usb_template.h>
+#include <bus/u4b/template/usb_template.h>
 #endif         /* USB_GLOBAL_INCLUDE_FILE */
 
 #define        MODEM_IFACE_0 0
index e1f83bd..e873262 100644 (file)
@@ -2477,6 +2477,7 @@ bus/u4b/template/usb_template_modem.c     optional usb_template
 bus/u4b/template/usb_template_mouse.c  optional usb_template
 bus/u4b/template/usb_template_msc.c    optional usb_template
 bus/u4b/template/usb_template_mtp.c    optional usb_template
+bus/u4b/template/usb_template_serialnet.c optional usb_template
 #
 # Other drivers
 #