[src/trunk]: src/sys/dev/ic Move "opt_slhci.h" from .h to .c

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

details:   https://anonhg.NetBSD.org/src/rev/35987d2faad9
branches:  trunk
changeset: 754662:35987d2faad9
user:      isaki <isaki%NetBSD.org@localhost>
date:      Sat May 08 01:33:00 2010 +0000

description:
Move "opt_slhci.h" from .h to .c
to avoid link error (multiple definition of _KERNEL_OPT_foo).

diffstat:

 sys/dev/ic/sl811hs.c    |  6 ++++--
 sys/dev/ic/sl811hsvar.h |  3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 540122a4e93c -r 35987d2faad9 sys/dev/ic/sl811hs.c
--- a/sys/dev/ic/sl811hs.c      Sat May 08 00:33:28 2010 +0000
+++ b/sys/dev/ic/sl811hs.c      Sat May 08 01:33:00 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sl811hs.c,v 1.25 2009/11/25 14:28:50 rmind Exp $       */
+/*     $NetBSD: sl811hs.c,v 1.26 2010/05/08 01:33:00 isaki Exp $       */
 
 /*
  * Not (c) 2007 Matthew Orgass
@@ -84,7 +84,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.25 2009/11/25 14:28:50 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.26 2010/05/08 01:33:00 isaki Exp $");
+
+#include "opt_slhci.h"
 
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff -r 540122a4e93c -r 35987d2faad9 sys/dev/ic/sl811hsvar.h
--- a/sys/dev/ic/sl811hsvar.h   Sat May 08 00:33:28 2010 +0000
+++ b/sys/dev/ic/sl811hsvar.h   Sat May 08 01:33:00 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sl811hsvar.h,v 1.6 2009/05/12 14:25:18 cegger Exp $    */
+/*     $NetBSD: sl811hsvar.h,v 1.7 2010/05/08 01:33:00 isaki Exp $     */
 
 /*
  * Not (c) 2007 Matthew Orgass
@@ -15,7 +15,6 @@
 
 #include <sys/gcq.h>
 #include <sys/simplelock.h>
-#include "opt_slhci.h"
 
 #define SC_DEV(sc)     ((sc)->sc_dev)
 #define SC_NAME(sc)    (device_xname(SC_DEV(sc)))