diff options
| author | isaki <isaki@NetBSD.org> | 2010-05-08 01:33:00 +0000 |
|---|---|---|
| committer | isaki <isaki@NetBSD.org> | 2010-05-08 01:33:00 +0000 |
| commit | d4edb08e1028c7d95de9517655093eaaf17bae7c (patch) | |
| tree | 3410a5b01f9281c3c3a7eb6796c2dc2bb93ec4f0 /sys/dev | |
| parent | 651dd2889a90c73d5cca8dee2f69ba66b194cb04 (diff) | |
Move "opt_slhci.h" from .h to .c
to avoid link error (multiple definition of _KERNEL_OPT_foo).
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/sl811hs.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/sl811hsvar.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/ic/sl811hs.c b/sys/dev/ic/sl811hs.c index cc5aad510ff..f34ff5ae9d2 100644 --- a/sys/dev/ic/sl811hs.c +++ b/sys/dev/ic/sl811hs.c @@ -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 --git a/sys/dev/ic/sl811hsvar.h b/sys/dev/ic/sl811hsvar.h index 7055719ff6f..ea5ade9ad3d 100644 --- a/sys/dev/ic/sl811hsvar.h +++ b/sys/dev/ic/sl811hsvar.h @@ -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))) |
