summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2008-11-18 14:29:55 +0000
committerad <ad@NetBSD.org>2008-11-18 14:29:55 +0000
commit54ef4675800e1da125c99ca085e0e391bcb06c39 (patch)
tree720a8e6e0631ba7a3156cd6925c153d5cab64be8 /sys/dev/raidframe
parentfb6f7962ffe800ab41c253218838163430393728 (diff)
_KERNEL_OPT
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_driver.c6
-rw-r--r--sys/dev/raidframe/rf_evenodd_dagfuncs.c7
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c12
-rw-r--r--sys/dev/raidframe/rf_parityloggingdags.c9
4 files changed, 23 insertions, 11 deletions
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c
index b162f9ae244..e7c17e18194 100644
--- a/sys/dev/raidframe/rf_driver.c
+++ b/sys/dev/raidframe/rf_driver.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_driver.c,v 1.118 2008/04/28 20:23:56 martin Exp $ */
+/* $NetBSD: rf_driver.c,v 1.119 2008/11/18 14:29:55 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -66,9 +66,11 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.118 2008/04/28 20:23:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.119 2008/11/18 14:29:55 ad Exp $");
+#ifdef _KERNEL_OPT
#include "opt_raid_diagnostic.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/raidframe/rf_evenodd_dagfuncs.c b/sys/dev/raidframe/rf_evenodd_dagfuncs.c
index 1eebddb2b84..a296bec8b07 100644
--- a/sys/dev/raidframe/rf_evenodd_dagfuncs.c
+++ b/sys/dev/raidframe/rf_evenodd_dagfuncs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.18 2007/03/04 06:02:38 christos Exp $ */
+/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.19 2008/11/18 14:29:55 ad Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -31,10 +31,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_evenodd_dagfuncs.c,v 1.18 2007/03/04 06:02:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_evenodd_dagfuncs.c,v 1.19 2008/11/18 14:29:55 ad Exp $");
#include "rf_archs.h"
+
+#ifdef _KERNEL_OPT
#include "opt_raid_diagnostic.h"
+#endif
#if RF_INCLUDE_EVENODD > 0
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index f2bc5714ef4..e06bdc6ff37 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.250 2008/09/28 16:17:17 oster Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.251 2008/11/18 14:29:55 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -139,7 +139,12 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.250 2008/09/28 16:17:17 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.251 2008/11/18 14:29:55 ad Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_raid_autoconfig.h"
+#include "raid.h"
+#endif
#include <sys/param.h>
#include <sys/errno.h>
@@ -165,8 +170,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.250 2008/09/28 16:17:17 oster E
#include <dev/raidframe/raidframevar.h>
#include <dev/raidframe/raidframeio.h>
-#include "raid.h"
-#include "opt_raid_autoconfig.h"
+
#include "rf_raid.h"
#include "rf_copyback.h"
#include "rf_dag.h"
diff --git a/sys/dev/raidframe/rf_parityloggingdags.c b/sys/dev/raidframe/rf_parityloggingdags.c
index b6f13c20a5c..5f7e75a4530 100644
--- a/sys/dev/raidframe/rf_parityloggingdags.c
+++ b/sys/dev/raidframe/rf_parityloggingdags.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_parityloggingdags.c,v 1.18 2006/11/16 01:33:23 christos Exp $ */
+/* $NetBSD: rf_parityloggingdags.c,v 1.19 2008/11/18 14:29:55 ad Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -31,10 +31,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.18 2006/11/16 01:33:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.19 2008/11/18 14:29:55 ad Exp $");
-#include "rf_archs.h"
+#ifdef _KERNEL_OPT
#include "opt_raid_diagnostic.h"
+#endif
+
+#include "rf_archs.h"
#if RF_INCLUDE_PARITYLOGGING > 0