[src/trunk]: src/sys/dev/usb this used the wrong cpp variable for debugging s...

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

details:   https://anonhg.NetBSD.org/src/rev/cb8a74eba7e6
branches:  trunk
changeset: 783706:cb8a74eba7e6
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 05 14:54:06 2013 +0000

description:
this used the wrong cpp variable for debugging so it does not need opt_usb.h
after all.

diffstat:

 sys/dev/usb/umass_scsipi.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 328675e017b2 -r cb8a74eba7e6 sys/dev/usb/umass_scsipi.c
--- a/sys/dev/usb/umass_scsipi.c        Sat Jan 05 09:40:15 2013 +0000
+++ b/sys/dev/usb/umass_scsipi.c        Sat Jan 05 14:54:06 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass_scsipi.c,v 1.47 2013/01/05 01:30:17 christos Exp $       */
+/*     $NetBSD: umass_scsipi.c,v 1.48 2013/01/05 14:54:06 christos Exp $       */
 
 /*
  * Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
@@ -31,11 +31,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.47 2013/01/05 01:30:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.48 2013/01/05 14:54:06 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_umass.h"
-#include "opt_usb.h"
 #endif
 
 #include "atapibus.h"
@@ -234,7 +233,7 @@
                    periph->periph_target, periph->periph_lun,
                    xs, xs->cmd->opcode, xs->datalen,
                    periph->periph_quirks, xs->xs_control & XS_CTL_POLL));
-#if defined(USB_DEBUG) && defined(SCSIPI_DEBUG)
+#if defined(UMASS_DEBUG) && defined(SCSIPI_DEBUG)
                if (umassdebug & UDMASS_SCSI)
                        show_scsipi_xs(xs);
                else if (umassdebug & ~UDMASS_CMD)