svn commit: r294546 - head/sys/boot/kshim

[Wojciech Macek]

Author: wma
Date: Fri Jan 22 06:05:31 2016
New Revision: 294546
URL: https://svnweb.freebsd.org/changeset/base/294546

Log:
  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

Modified:
  head/sys/boot/kshim/bsd_global.h
  head/sys/boot/kshim/bsd_kernel.h

Modified: head/sys/boot/kshim/bsd_global.h
==============================================================================
--- head/sys/boot/kshim/bsd_global.h	Fri Jan 22 03:25:06 2016	(r294545)
+++ head/sys/boot/kshim/bsd_global.h	Fri Jan 22 06:05:31 2016	(r294546)
@@ -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>

Modified: head/sys/boot/kshim/bsd_kernel.h
==============================================================================
--- head/sys/boot/kshim/bsd_kernel.h	Fri Jan 22 03:25:06 2016	(r294545)
+++ head/sys/boot/kshim/bsd_kernel.h	Fri Jan 22 06:05:31 2016	(r294546)
@@ -579,4 +579,7 @@ extern int (*ofw_bus_is_compatible_cb)(d
 #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_ */