[src/trunk]: src/sys/dev/usb Pull in opt_usb.h in _KERNEL_OPT case for variou...

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

details:   https://anonhg.NetBSD.org/src/rev/90cd770582eb
branches:  trunk
changeset: 344912:90cd770582eb
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Wed Apr 27 19:35:17 2016 +0000

description:
Pull in opt_usb.h in _KERNEL_OPT case for various *_DEBUG options.
Makes various driver-specific debugging options work again.

XXX more to fix in dev/usb

diffstat:

 sys/dev/usb/hid.c    |  8 ++++++--
 sys/dev/usb/uhid.c   |  5 +++--
 sys/dev/usb/uhidev.c |  8 ++++++--
 sys/dev/usb/ukbd.c   |  5 +++--
 sys/dev/usb/ums.c    |  8 ++++++--
 sys/dev/usb/uts.c    |  8 ++++++--
 6 files changed, 30 insertions(+), 12 deletions(-)

diffs (133 lines):

diff -r f70e9bde59ce -r 90cd770582eb sys/dev/usb/hid.c
--- a/sys/dev/usb/hid.c Wed Apr 27 08:53:28 2016 +0000
+++ b/sys/dev/usb/hid.c Wed Apr 27 19:35:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hid.c,v 1.44 2016/04/23 10:15:31 skrll Exp $   */
+/*     $NetBSD: hid.c,v 1.45 2016/04/27 19:35:17 jakllsch Exp $        */
 /*     $FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
 
 /*
@@ -32,7 +32,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.44 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.45 2016/04/27 19:35:17 jakllsch Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_usb.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r f70e9bde59ce -r 90cd770582eb sys/dev/usb/uhid.c
--- a/sys/dev/usb/uhid.c        Wed Apr 27 08:53:28 2016 +0000
+++ b/sys/dev/usb/uhid.c        Wed Apr 27 19:35:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhid.c,v 1.95 2016/04/23 10:15:32 skrll Exp $  */
+/*     $NetBSD: uhid.c,v 1.96 2016/04/27 19:35:17 jakllsch Exp $       */
 
 /*
  * Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,10 +35,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.95 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.96 2016/04/27 19:35:17 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
+#include "opt_usb.h"
 #endif
 
 #include <sys/param.h>
diff -r f70e9bde59ce -r 90cd770582eb sys/dev/usb/uhidev.c
--- a/sys/dev/usb/uhidev.c      Wed Apr 27 08:53:28 2016 +0000
+++ b/sys/dev/usb/uhidev.c      Wed Apr 27 19:35:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhidev.c,v 1.65 2016/04/23 10:15:32 skrll Exp $        */
+/*     $NetBSD: uhidev.c,v 1.66 2016/04/27 19:35:17 jakllsch Exp $     */
 
 /*
  * Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.65 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.66 2016/04/27 19:35:17 jakllsch Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_usb.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r f70e9bde59ce -r 90cd770582eb sys/dev/usb/ukbd.c
--- a/sys/dev/usb/ukbd.c        Wed Apr 27 08:53:28 2016 +0000
+++ b/sys/dev/usb/ukbd.c        Wed Apr 27 19:35:17 2016 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: ukbd.c,v 1.131 2016/04/23 10:15:32 skrll Exp $        */
+/*      $NetBSD: ukbd.c,v 1.132 2016/04/27 19:35:17 jakllsch Exp $        */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,11 +35,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.131 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.132 2016/04/27 19:35:17 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ukbd.h"
 #include "opt_ukbd_layout.h"
+#include "opt_usb.h"
 #include "opt_wsdisplay_compat.h"
 #include "opt_ddb.h"
 #endif /* _KERNEL_OPT */
diff -r f70e9bde59ce -r 90cd770582eb sys/dev/usb/ums.c
--- a/sys/dev/usb/ums.c Wed Apr 27 08:53:28 2016 +0000
+++ b/sys/dev/usb/ums.c Wed Apr 27 19:35:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ums.c,v 1.89 2016/04/23 10:15:32 skrll Exp $   */
+/*     $NetBSD: ums.c,v 1.90 2016/04/27 19:35:17 jakllsch Exp $        */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.89 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.90 2016/04/27 19:35:17 jakllsch Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_usb.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r f70e9bde59ce -r 90cd770582eb sys/dev/usb/uts.c
--- a/sys/dev/usb/uts.c Wed Apr 27 08:53:28 2016 +0000
+++ b/sys/dev/usb/uts.c Wed Apr 27 19:35:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uts.c,v 1.4 2016/04/23 10:15:32 skrll Exp $    */
+/*     $NetBSD: uts.c,v 1.5 2016/04/27 19:35:17 jakllsch Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.4 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.5 2016/04/27 19:35:17 jakllsch Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_usb.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>