summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2008-01-04 21:17:40 +0000
committerad <ad@NetBSD.org>2008-01-04 21:17:40 +0000
commit0664a0459bf6ef4342e31b3bf0327a7bc3997776 (patch)
treeb48e347640c1fc0918c24ded9444d55a24a31878 /sys/dev/raidframe
parent46a018d0e2a929dda153017a300c25e2e4c045c5 (diff)
Start detangling lock.h from intr.h. This is likely to cause short term
breakage, but the mess of dependencies has been regularly breaking the build recently anyhow.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/raidframevar.h4
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/raidframe/raidframevar.h b/sys/dev/raidframe/raidframevar.h
index 153cc6c0cf2..2bbc498b6ab 100644
--- a/sys/dev/raidframe/raidframevar.h
+++ b/sys/dev/raidframe/raidframevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: raidframevar.h,v 1.10 2006/09/05 01:55:21 oster Exp $ */
+/* $NetBSD: raidframevar.h,v 1.11 2008/01/04 21:18:05 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -109,7 +109,7 @@
#include <sys/uio.h>
#include <sys/param.h>
#include <sys/proc.h>
-#include <sys/lock.h>
+#include <sys/simplelock.h>
#include <sys/mallocvar.h>
#endif
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 608c1440b21..44e077e7733 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.242 2008/01/02 11:48:38 ad Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.243 2008/01/04 21:18:05 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -146,7 +146,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.242 2008/01/02 11:48:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.243 2008/01/04 21:18:05 ad Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -162,7 +162,6 @@ __KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.242 2008/01/02 11:48:38 ad Exp
#include <sys/vnode.h>
#include <sys/disklabel.h>
#include <sys/conf.h>
-#include <sys/lock.h>
#include <sys/buf.h>
#include <sys/bufq.h>
#include <sys/user.h>