Module Name: src
Committed By: christos
Date: Sat Jan 5 14:54:06 UTC 2013
Modified Files:
src/sys/dev/usb: umass_scsipi.c
Log Message:
this used the wrong cpp variable for debugging so it does not need opt_usb.h
after all.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/usb/umass_scsipi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.47 src/sys/dev/usb/umass_scsipi.c:1.48
--- src/sys/dev/usb/umass_scsipi.c:1.47 Fri Jan 4 20:30:17 2013
+++ src/sys/dev/usb/umass_scsipi.c Sat Jan 5 09:54:06 2013
@@ -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 @@ umass_scsipi_request(struct scsipi_chann
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)
