[src/trunk]: src/sys/dev/usb Make the non-USBHIST case compile

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c4adb207e32d
branches:  trunk
changeset: 338555:c4adb207e32d
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat May 30 06:41:08 2015 +0000

description:
Make the non-USBHIST case compile

diffstat:

 sys/dev/usb/usb.c     |  6 +++---
 sys/dev/usb/usbhist.h |  4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r 62030c69a4da -r c4adb207e32d sys/dev/usb/usb.c
--- a/sys/dev/usb/usb.c Sat May 30 06:10:38 2015 +0000
+++ b/sys/dev/usb/usb.c Sat May 30 06:41:08 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usb.c,v 1.158 2015/05/30 06:10:38 skrll Exp $  */
+/*     $NetBSD: usb.c,v 1.159 2015/05/30 06:41:08 skrll Exp $  */
 
 /*
  * Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.158 2015/05/30 06:10:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.159 2015/05/30 06:41:08 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -277,7 +277,7 @@
        struct usb_taskq *taskq;
        int i;
 
-       KERNHIST_LINK_STATIC(usbhist);
+       USBHIST_LINK_STATIC(usbhist);
 
        selinit(&usb_selevent);
        mutex_init(&usb_event_lock, MUTEX_DEFAULT, IPL_NONE);
diff -r 62030c69a4da -r c4adb207e32d sys/dev/usb/usbhist.h
--- a/sys/dev/usb/usbhist.h     Sat May 30 06:10:38 2015 +0000
+++ b/sys/dev/usb/usbhist.h     Sat May 30 06:41:08 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbhist.h,v 1.1 2014/09/12 16:40:38 skrll Exp $        */
+/*     $NetBSD: usbhist.h,v 1.2 2015/05/30 06:41:08 skrll Exp $        */
 
 /*
  * Copyright (c) 2012 Matthew R. Green
@@ -52,6 +52,7 @@
 #define USBHIST_DEFINE(NAME)           KERNHIST_DEFINE(NAME)
 #define USBHIST_INIT(NAME,N)           KERNHIST_INIT(NAME,N)
 #define USBHIST_INIT_STATIC(NAME,BUF)  KERNHIST_INIT_STATIC(NAME,BUF)
+#define USBHIST_LINK_STATIC(NAME)      KERNHIST_LINK_STATIC(NAME)
 #define USBHIST_LOGN(NAME,N,FMT,A,B,C,D)       do {            \
        if ((NAME) >= (N)) {                                    \
                KERNHIST_LOG(usbhist,FMT,A,B,C,D);              \
@@ -73,6 +74,7 @@
 #define USBHIST_DEFINE(NAME)
 #define USBHIST_INIT(NAME,N)
 #define USBHIST_INIT_STATIC(NAME,BUF)
+#define USBHIST_LINK_STATIC(NAME)
 #define USBHIST_LOGN(N,NAME,FMT,A,B,C,D)       do { } while(0)
 #define USBHIST_LOG(NAME,FMT,A,B,C,D)          do { } while(0)
 #define USBHIST_CALLED(NAME)