Module Name: src
Committed By: isaki
Date: Sat May 8 01:33:00 UTC 2010
Modified Files:
src/sys/dev/ic: sl811hs.c sl811hsvar.h
Log Message:
Move "opt_slhci.h" from .h to .c
to avoid link error (multiple definition of _KERNEL_OPT_foo).
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/sl811hsvar.h
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/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.25 src/sys/dev/ic/sl811hs.c:1.26
--- src/sys/dev/ic/sl811hs.c:1.25 Wed Nov 25 14:28:50 2009
+++ src/sys/dev/ic/sl811hs.c Sat May 8 01:33:00 2010
@@ -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>
Index: src/sys/dev/ic/sl811hsvar.h
diff -u src/sys/dev/ic/sl811hsvar.h:1.6 src/sys/dev/ic/sl811hsvar.h:1.7
--- src/sys/dev/ic/sl811hsvar.h:1.6 Tue May 12 14:25:18 2009
+++ src/sys/dev/ic/sl811hsvar.h Sat May 8 01:33:00 2010
@@ -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)))
