[src/trunk]: src/sys/dev/scsipi would you like some freshly ground _KERNEL_OP...

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

details:   https://anonhg.NetBSD.org/src/rev/cad15c5d6b7f
branches:  trunk
changeset: 340157:cad15c5d6b7f
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Aug 24 23:13:15 2015 +0000

description:
would you like some freshly ground _KERNEL_OPT with that?
yes?  excellent choice, sir/madam.

diffstat:

 sys/dev/scsipi/if_se.c       |  6 ++++--
 sys/dev/scsipi/scsipi_base.c |  6 ++++--
 sys/dev/scsipi/sd.c          |  6 ++++--
 sys/dev/scsipi/sdvar.h       |  4 +++-
 sys/dev/scsipi/ses.c         |  6 ++++--
 sys/dev/scsipi/st.c          |  6 ++++--
 sys/dev/scsipi/st_atapi.c    |  6 ++++--
 sys/dev/scsipi/st_scsi.c     |  6 ++++--
 8 files changed, 31 insertions(+), 15 deletions(-)

diffs (174 lines):

diff -r 770c4cbfcfbc -r cad15c5d6b7f sys/dev/scsipi/if_se.c
--- a/sys/dev/scsipi/if_se.c    Mon Aug 24 23:04:42 2015 +0000
+++ b/sys/dev/scsipi/if_se.c    Mon Aug 24 23:13:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_se.c,v 1.87 2014/07/25 08:10:38 dholland Exp $      */
+/*     $NetBSD: if_se.c,v 1.88 2015/08/24 23:13:15 pooka Exp $ */
 
 /*
  * Copyright (c) 1997 Ian W. Dall <ian.dall%dsto.defence.gov.au@localhost>
@@ -59,10 +59,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.87 2014/07/25 08:10:38 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.88 2015/08/24 23:13:15 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_atalk.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 770c4cbfcfbc -r cad15c5d6b7f sys/dev/scsipi/scsipi_base.c
--- a/sys/dev/scsipi/scsipi_base.c      Mon Aug 24 23:04:42 2015 +0000
+++ b/sys/dev/scsipi/scsipi_base.c      Mon Aug 24 23:13:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipi_base.c,v 1.164 2014/11/18 17:03:41 joerg Exp $  */
+/*     $NetBSD: scsipi_base.c,v 1.165 2015/08/24 23:13:15 pooka Exp $  */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -31,9 +31,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.164 2014/11/18 17:03:41 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.165 2015/08/24 23:13:15 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_scsi.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 770c4cbfcfbc -r cad15c5d6b7f sys/dev/scsipi/sd.c
--- a/sys/dev/scsipi/sd.c       Mon Aug 24 23:04:42 2015 +0000
+++ b/sys/dev/scsipi/sd.c       Mon Aug 24 23:13:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sd.c,v 1.316 2015/04/26 15:15:20 mlelstv Exp $ */
+/*     $NetBSD: sd.c,v 1.317 2015/08/24 23:13:15 pooka Exp $   */
 
 /*-
  * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,9 +47,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.316 2015/04/26 15:15:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.317 2015/08/24 23:13:15 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_scsi.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 770c4cbfcfbc -r cad15c5d6b7f sys/dev/scsipi/sdvar.h
--- a/sys/dev/scsipi/sdvar.h    Mon Aug 24 23:04:42 2015 +0000
+++ b/sys/dev/scsipi/sdvar.h    Mon Aug 24 23:13:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdvar.h,v 1.36 2015/04/13 16:33:25 riastradh Exp $     */
+/*     $NetBSD: sdvar.h,v 1.37 2015/08/24 23:13:15 pooka Exp $ */
 
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -49,7 +49,9 @@
 #ifndef _DEV_SCSIPI_SDVAR_H_
 #define _DEV_SCSIPI_SDVAR_H_
 
+#ifdef _KERNEL_OPT
 #include "opt_scsi.h"
+#endif
 
 #include <sys/rndsource.h>
 
diff -r 770c4cbfcfbc -r cad15c5d6b7f sys/dev/scsipi/ses.c
--- a/sys/dev/scsipi/ses.c      Mon Aug 24 23:04:42 2015 +0000
+++ b/sys/dev/scsipi/ses.c      Mon Aug 24 23:13:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ses.c,v 1.47 2014/07/25 08:10:38 dholland Exp $ */
+/*     $NetBSD: ses.c,v 1.48 2015/08/24 23:13:15 pooka Exp $ */
 /*
  * Copyright (C) 2000 National Aeronautics & Space Administration
  * All rights reserved.
@@ -26,9 +26,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.47 2014/07/25 08:10:38 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.48 2015/08/24 23:13:15 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_scsi.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 770c4cbfcfbc -r cad15c5d6b7f sys/dev/scsipi/st.c
--- a/sys/dev/scsipi/st.c       Mon Aug 24 23:04:42 2015 +0000
+++ b/sys/dev/scsipi/st.c       Mon Aug 24 23:13:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: st.c,v 1.226 2014/08/10 16:44:36 tls Exp $ */
+/*     $NetBSD: st.c,v 1.227 2015/08/24 23:13:15 pooka Exp $ */
 
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -50,9 +50,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.226 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.227 2015/08/24 23:13:15 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_scsi.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 770c4cbfcfbc -r cad15c5d6b7f sys/dev/scsipi/st_atapi.c
--- a/sys/dev/scsipi/st_atapi.c Mon Aug 24 23:04:42 2015 +0000
+++ b/sys/dev/scsipi/st_atapi.c Mon Aug 24 23:13:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: st_atapi.c,v 1.29 2012/04/19 17:45:21 bouyer Exp $ */
+/*     $NetBSD: st_atapi.c,v 1.30 2015/08/24 23:13:15 pooka Exp $ */
 
 /*
  * Copyright (c) 2001 Manuel Bouyer.
@@ -25,9 +25,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.29 2012/04/19 17:45:21 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.30 2015/08/24 23:13:15 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_scsi.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/device.h>
diff -r 770c4cbfcfbc -r cad15c5d6b7f sys/dev/scsipi/st_scsi.c
--- a/sys/dev/scsipi/st_scsi.c  Mon Aug 24 23:04:42 2015 +0000
+++ b/sys/dev/scsipi/st_scsi.c  Mon Aug 24 23:13:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: st_scsi.c,v 1.36 2014/10/18 08:33:28 snj Exp $ */
+/*     $NetBSD: st_scsi.c,v 1.37 2015/08/24 23:13:15 pooka Exp $ */
 
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -50,9 +50,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.36 2014/10/18 08:33:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.37 2015/08/24 23:13:15 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_scsi.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/device.h>