From owner-svn-src-head@freebsd.org  Fri Jan 22 06:05:32 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E584CA8C704;
 Fri, 22 Jan 2016 06:05:32 +0000 (UTC) (envelope-from wma@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B690B1F8F;
 Fri, 22 Jan 2016 06:05:32 +0000 (UTC) (envelope-from wma@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0M65Vfc041828;
 Fri, 22 Jan 2016 06:05:31 GMT (envelope-from wma@FreeBSD.org)
Received: (from wma@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0M65VcG041826;
 Fri, 22 Jan 2016 06:05:31 GMT (envelope-from wma@FreeBSD.org)
Message-Id: <201601220605.u0M65VcG041826@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wma set sender to wma@FreeBSD.org
 using -f
From: Wojciech Macek <wma@FreeBSD.org>
Date: Fri, 22 Jan 2016 06:05:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294546 - head/sys/boot/kshim
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jan 2016 06:05:33 -0000

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_ */