summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwma <wma@FreeBSD.org>2016-01-22 06:05:31 +0000
committerwma <wma@FreeBSD.org>2016-01-22 06:05:31 +0000
commitc9a272ca00cf913df9349d36d4d223352d90cd59 (patch)
tree2246e191c6e9abee31337cd7567eea08f98be832
parent078702fc472ecc0b73f0ad188ded067b8bf573e7 (diff)
downloadFreeBSD-src-c9a272ca00cf913df9349d36d4d223352d90cd59.zip
FreeBSD-src-c9a272ca00cf913df9349d36d4d223352d90cd59.tar.gz
Fix compilation errors in usb/kshim
Remove old header from the include list and declare extern symbol for delay() function. Approved by: hselasky, cognet (mentor) Differential revision: https://reviews.freebsd.org/D5012
-rw-r--r--sys/boot/kshim/bsd_global.h1
-rw-r--r--sys/boot/kshim/bsd_kernel.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/boot/kshim/bsd_global.h b/sys/boot/kshim/bsd_global.h
index 4f6d88b..63bba75 100644
--- a/sys/boot/kshim/bsd_global.h
+++ b/sys/boot/kshim/bsd_global.h
@@ -55,7 +55,6 @@
#include <dev/usb/usb_pf.h>
#include <dev/usb/usb_request.h>
#include <dev/usb/usb_util.h>
-#include <dev/usb/usb_compat_linux.h>
#include <dev/usb/usbhid.h>
#include <dev/usb/usb_ioctl.h>
#include <dev/usb/usb_generic.h>
diff --git a/sys/boot/kshim/bsd_kernel.h b/sys/boot/kshim/bsd_kernel.h
index 72e0d23..9d16f1b 100644
--- a/sys/boot/kshim/bsd_kernel.h
+++ b/sys/boot/kshim/bsd_kernel.h
@@ -579,4 +579,7 @@ extern int (*ofw_bus_is_compatible_cb)(device_t dev, char *name);
#define strlcpy(d,s,n) snprintf((d),(n),"%s",(s))
#endif
+/* Should be defined in user application since it is machine-dependent */
+extern int delay(unsigned int);
+
#endif /* _BSD_KERNEL_H_ */
OpenPOWER on IntegriCloud