Module Name: src
Committed By: mbalmer
Date: Wed Aug 24 11:28:51 UTC 2011
Modified Files:
src/sys/dev/usb: umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
Log Message:
Wrap the include "opt_umass.h" in #ifdef _KERNEL_OPT.
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/umass_isdata.c
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/usb/umass_quirks.c
cvs rdiff -u -r1.37 -r1.38 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.c
diff -u src/sys/dev/usb/umass.c:1.140 src/sys/dev/usb/umass.c:1.141
--- src/sys/dev/usb/umass.c:1.140 Tue Aug 23 16:16:43 2011
+++ src/sys/dev/usb/umass.c Wed Aug 24 11:28:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.140 2011/08/23 16:16:43 christos Exp $ */
+/* $NetBSD: umass.c,v 1.141 2011/08/24 11:28:50 mbalmer Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,9 +124,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.140 2011/08/23 16:16:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.141 2011/08/24 11:28:50 mbalmer Exp $");
+#ifdef _KERNEL_OPT
#include "opt_umass.h"
+#endif
#include "atapibus.h"
#include "scsibus.h"
Index: src/sys/dev/usb/umass_isdata.c
diff -u src/sys/dev/usb/umass_isdata.c:1.20 src/sys/dev/usb/umass_isdata.c:1.21
--- src/sys/dev/usb/umass_isdata.c:1.20 Tue Aug 23 16:16:43 2011
+++ src/sys/dev/usb/umass_isdata.c Wed Aug 24 11:28:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_isdata.c,v 1.20 2011/08/23 16:16:43 christos Exp $ */
+/* $NetBSD: umass_isdata.c,v 1.21 2011/08/24 11:28:50 mbalmer Exp $ */
/*
* TODO:
@@ -37,9 +37,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.20 2011/08/23 16:16:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.21 2011/08/24 11:28:50 mbalmer Exp $");
+#ifdef _KERNEL_OPT
#include "opt_umass.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/usb/umass_quirks.c
diff -u src/sys/dev/usb/umass_quirks.c:1.86 src/sys/dev/usb/umass_quirks.c:1.87
--- src/sys/dev/usb/umass_quirks.c:1.86 Tue Aug 23 16:16:43 2011
+++ src/sys/dev/usb/umass_quirks.c Wed Aug 24 11:28:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_quirks.c,v 1.86 2011/08/23 16:16:43 christos Exp $ */
+/* $NetBSD: umass_quirks.c,v 1.87 2011/08/24 11:28:50 mbalmer Exp $ */
/*
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -32,9 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.86 2011/08/23 16:16:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.87 2011/08/24 11:28:50 mbalmer Exp $");
+#ifdef _KERNEL_OPT
#include "opt_umass.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.37 src/sys/dev/usb/umass_scsipi.c:1.38
--- src/sys/dev/usb/umass_scsipi.c:1.37 Tue Aug 23 16:16:43 2011
+++ src/sys/dev/usb/umass_scsipi.c Wed Aug 24 11:28:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.37 2011/08/23 16:16:43 christos Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.38 2011/08/24 11:28:50 mbalmer Exp $ */
/*
* Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
@@ -31,9 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.37 2011/08/23 16:16:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.38 2011/08/24 11:28:50 mbalmer Exp $");
+#ifdef _KERNEL_OPT
#include "opt_umass.h"
+#endif
#include "atapibus.h"
#include "scsibus.h"
