[src/trunk]: src/sys/dev/usb Fix build when USB_DEBUG is defined and EHCI_DEB...

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

details:   https://anonhg.NetBSD.org/src/rev/ce0f4b11bd5b
branches:  trunk
changeset: 332257:ce0f4b11bd5b
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Sep 13 08:15:43 2014 +0000

description:
Fix build when USB_DEBUG is defined and EHCI_DEBUG isn't. The converse is
always true.

PR/49201 (broken build with options USB_DEBUG (latest current))

diffstat:

 sys/dev/usb/ehci.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r 89b587dd2e80 -r ce0f4b11bd5b sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Sat Sep 13 08:08:24 2014 +0000
+++ b/sys/dev/usb/ehci.c        Sat Sep 13 08:15:43 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.229 2014/09/12 16:40:38 skrll Exp $ */
+/*     $NetBSD: ehci.c,v 1.230 2014/09/13 08:15:43 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.229 2014/09/12 16:40:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.230 2014/09/13 08:15:43 skrll Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -86,7 +86,11 @@
 #include <dev/usb/ehcireg.h>
 #include <dev/usb/ehcivar.h>
 
-#ifdef EHCI_DEBUG
+
+#ifdef USB_DEBUG
+#ifndef EHCI_DEBUG
+#define ehcidebug 0
+#else
 static int ehcidebug = 0;
 
 SYSCTL_SETUP(sysctl_hw_ehci_setup, "sysctl hw.ehci setup")
@@ -117,6 +121,7 @@
 }
 
 #endif /* EHCI_DEBUG */
+#endif /* USB_DEBUG */
 
 struct ehci_pipe {
        struct usbd_pipe pipe;