From fb919e4d5a2c1baca52ac70d1064f140fffdda71 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Tue, 1 May 2001 08:13:21 +0000
Subject: Undo part of the tangle of having sys/lock.h and sys/mutex.h included
 in other "system" header files.

Also help the deprecation of lockmgr.h by making it a sub-include of
sys/lock.h and removing sys/lockmgr.h form kernel .c files.

Sort sys/*.h includes where possible in affected files.

OK'ed by:	bde (with reservations)
---
 sys/dev/usb/uhid.c | 2 ++
 sys/dev/usb/usb.c  | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'sys/dev/usb')

diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index d34329ea7bf7..869e94ecd7b1 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -45,7 +45,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/signalvar.h>
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/device.h>
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 338871af4407..c99f8bfb000d 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -47,7 +47,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/device.h>
 #include <sys/kthread.h>
-- 
cgit v1.3