[src/trunk]: src/sys/dev add some _KERNEL_OPT as the finishing touch

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

details:   https://anonhg.NetBSD.org/src/rev/1dfce6c5f821
branches:  trunk
changeset: 340163:1dfce6c5f821
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Aug 24 23:55:04 2015 +0000

description:
add some _KERNEL_OPT as the finishing touch

diffstat:

 sys/dev/mii/igphy.c      |   6 ++++--
 sys/dev/mii/ukphy.c      |   6 ++++--
 sys/dev/pci/pci.c        |   6 ++++--
 sys/dev/pci/pci_stub.c   |   4 +++-
 sys/dev/pci/pci_usrreq.c |  10 ++++++----
 sys/dev/pci/pciidevar.h  |   7 +++++--
 sys/dev/usb/ehci.c       |   7 +++++--
 7 files changed, 31 insertions(+), 15 deletions(-)

diffs (161 lines):

diff -r 252c13b9e671 -r 1dfce6c5f821 sys/dev/mii/igphy.c
--- a/sys/dev/mii/igphy.c       Mon Aug 24 23:52:18 2015 +0000
+++ b/sys/dev/mii/igphy.c       Mon Aug 24 23:55:04 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: igphy.c,v 1.23 2014/06/16 16:48:16 msaitoh Exp $       */
+/*     $NetBSD: igphy.c,v 1.24 2015/08/24 23:55:04 pooka Exp $ */
 
 /*
  * The Intel copyright applies to the analog register setup, and the
@@ -70,9 +70,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.23 2014/06/16 16:48:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.24 2015/08/24 23:55:04 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_mii.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 252c13b9e671 -r 1dfce6c5f821 sys/dev/mii/ukphy.c
--- a/sys/dev/mii/ukphy.c       Mon Aug 24 23:52:18 2015 +0000
+++ b/sys/dev/mii/ukphy.c       Mon Aug 24 23:55:04 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ukphy.c,v 1.46 2013/06/11 16:18:48 msaitoh Exp $       */
+/*     $NetBSD: ukphy.c,v 1.47 2015/08/24 23:55:04 pooka Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -59,9 +59,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.46 2013/06/11 16:18:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.47 2015/08/24 23:55:04 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_mii.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 252c13b9e671 -r 1dfce6c5f821 sys/dev/pci/pci.c
--- a/sys/dev/pci/pci.c Mon Aug 24 23:52:18 2015 +0000
+++ b/sys/dev/pci/pci.c Mon Aug 24 23:55:04 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci.c,v 1.147 2015/08/13 04:39:33 msaitoh Exp $        */
+/*     $NetBSD: pci.c,v 1.148 2015/08/24 23:55:04 pooka Exp $  */
 
 /*
  * Copyright (c) 1995, 1996, 1997, 1998
@@ -36,9 +36,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.147 2015/08/13 04:39:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.148 2015/08/24 23:55:04 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_pci.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff -r 252c13b9e671 -r 1dfce6c5f821 sys/dev/pci/pci_stub.c
--- a/sys/dev/pci/pci_stub.c    Mon Aug 24 23:52:18 2015 +0000
+++ b/sys/dev/pci/pci_stub.c    Mon Aug 24 23:55:04 2015 +0000
@@ -1,7 +1,9 @@
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_stub.c,v 1.2 2015/08/17 06:16:03 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_stub.c,v 1.3 2015/08/24 23:55:04 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_pci.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 252c13b9e671 -r 1dfce6c5f821 sys/dev/pci/pci_usrreq.c
--- a/sys/dev/pci/pci_usrreq.c  Mon Aug 24 23:52:18 2015 +0000
+++ b/sys/dev/pci/pci_usrreq.c  Mon Aug 24 23:55:04 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_usrreq.c,v 1.28 2014/07/25 08:10:38 dholland Exp $ */
+/*     $NetBSD: pci_usrreq.c,v 1.29 2015/08/24 23:55:04 pooka Exp $    */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.28 2014/07/25 08:10:38 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.29 2015/08/24 23:55:04 pooka Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_pci.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -56,8 +60,6 @@
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciio.h>
 
-#include "opt_pci.h"
-
 static int
 pciopen(dev_t dev, int flags, int mode, struct lwp *l)
 {
diff -r 252c13b9e671 -r 1dfce6c5f821 sys/dev/pci/pciidevar.h
--- a/sys/dev/pci/pciidevar.h   Mon Aug 24 23:52:18 2015 +0000
+++ b/sys/dev/pci/pciidevar.h   Mon Aug 24 23:55:04 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciidevar.h,v 1.46 2012/07/31 15:50:36 bouyer Exp $    */
+/*     $NetBSD: pciidevar.h,v 1.47 2015/08/24 23:55:04 pooka Exp $     */
 
 /*
  * Copyright (c) 1998 Christopher G. Demetriou.  All rights reserved.
@@ -39,11 +39,14 @@
  * Author: Christopher G. Demetriou, March 2, 1998.
  */
 
+#ifdef _KERNEL_OPT
+#include "opt_pciide.h"
+#endif
+
 #include <dev/ata/atavar.h>
 #include <dev/ic/wdcreg.h>
 #include <dev/ic/wdcvar.h>
 #include <sys/device_if.h>
-#include "opt_pciide.h"
 
 /* options passed via the 'flags' config keyword */
 #define        PCIIDE_OPTIONS_DMA      0x01
diff -r 252c13b9e671 -r 1dfce6c5f821 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Mon Aug 24 23:52:18 2015 +0000
+++ b/sys/dev/usb/ehci.c        Mon Aug 24 23:55:04 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.243 2015/08/19 06:23:35 skrll Exp $ */
+/*     $NetBSD: ehci.c,v 1.244 2015/08/24 23:55:04 pooka Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,11 +53,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.243 2015/08/19 06:23:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.244 2015/08/24 23:55:04 pooka Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
+
+#ifdef _KERNEL_OPT
 #include "opt_usb.h"
+#endif
 
 #include <sys/param.h>