Module Name: src
Committed By: pooka
Date: Mon Aug 24 23:13:15 UTC 2015
Modified Files:
src/sys/dev/scsipi: if_se.c scsipi_base.c sd.c sdvar.h ses.c st.c
st_atapi.c st_scsi.c
Log Message:
would you like some freshly ground _KERNEL_OPT with that?
yes? excellent choice, sir/madam.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/scsipi/if_se.c
cvs rdiff -u -r1.164 -r1.165 src/sys/dev/scsipi/scsipi_base.c
cvs rdiff -u -r1.316 -r1.317 src/sys/dev/scsipi/sd.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/scsipi/sdvar.h \
src/sys/dev/scsipi/st_scsi.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/scsipi/ses.c
cvs rdiff -u -r1.226 -r1.227 src/sys/dev/scsipi/st.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/scsipi/st_atapi.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/scsipi/if_se.c
diff -u src/sys/dev/scsipi/if_se.c:1.87 src/sys/dev/scsipi/if_se.c:1.88
--- src/sys/dev/scsipi/if_se.c:1.87 Fri Jul 25 08:10:38 2014
+++ src/sys/dev/scsipi/if_se.c Mon Aug 24 23:13:15 2015
@@ -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 <[email protected]>
@@ -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>
Index: src/sys/dev/scsipi/scsipi_base.c
diff -u src/sys/dev/scsipi/scsipi_base.c:1.164 src/sys/dev/scsipi/scsipi_base.c:1.165
--- src/sys/dev/scsipi/scsipi_base.c:1.164 Tue Nov 18 17:03:41 2014
+++ src/sys/dev/scsipi/scsipi_base.c Mon Aug 24 23:13:15 2015
@@ -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>
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.316 src/sys/dev/scsipi/sd.c:1.317
--- src/sys/dev/scsipi/sd.c:1.316 Sun Apr 26 15:15:20 2015
+++ src/sys/dev/scsipi/sd.c Mon Aug 24 23:13:15 2015
@@ -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>
Index: src/sys/dev/scsipi/sdvar.h
diff -u src/sys/dev/scsipi/sdvar.h:1.36 src/sys/dev/scsipi/sdvar.h:1.37
--- src/sys/dev/scsipi/sdvar.h:1.36 Mon Apr 13 16:33:25 2015
+++ src/sys/dev/scsipi/sdvar.h Mon Aug 24 23:13:15 2015
@@ -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>
Index: src/sys/dev/scsipi/st_scsi.c
diff -u src/sys/dev/scsipi/st_scsi.c:1.36 src/sys/dev/scsipi/st_scsi.c:1.37
--- src/sys/dev/scsipi/st_scsi.c:1.36 Sat Oct 18 08:33:28 2014
+++ src/sys/dev/scsipi/st_scsi.c Mon Aug 24 23:13:15 2015
@@ -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>
Index: src/sys/dev/scsipi/ses.c
diff -u src/sys/dev/scsipi/ses.c:1.47 src/sys/dev/scsipi/ses.c:1.48
--- src/sys/dev/scsipi/ses.c:1.47 Fri Jul 25 08:10:38 2014
+++ src/sys/dev/scsipi/ses.c Mon Aug 24 23:13:15 2015
@@ -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>
Index: src/sys/dev/scsipi/st.c
diff -u src/sys/dev/scsipi/st.c:1.226 src/sys/dev/scsipi/st.c:1.227
--- src/sys/dev/scsipi/st.c:1.226 Sun Aug 10 16:44:36 2014
+++ src/sys/dev/scsipi/st.c Mon Aug 24 23:13:15 2015
@@ -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>
Index: src/sys/dev/scsipi/st_atapi.c
diff -u src/sys/dev/scsipi/st_atapi.c:1.29 src/sys/dev/scsipi/st_atapi.c:1.30
--- src/sys/dev/scsipi/st_atapi.c:1.29 Thu Apr 19 17:45:21 2012
+++ src/sys/dev/scsipi/st_atapi.c Mon Aug 24 23:13:15 2015
@@ -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>
