aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2000-10-20 07:58:15 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2000-10-20 07:58:15 +0000
commit35e0e5b31144763b2053a8a033be4407987e7e69 (patch)
treef8963c2475693a3974f6608fa6e8c720fa433512 /sys/dev
parent341885a9fce84834fe9fe892fa2c577575150417 (diff)
downloadsrc-35e0e5b31144763b2053a8a033be4407987e7e69.tar.gz
src-35e0e5b31144763b2053a8a033be4407987e7e69.zip
Catch up to moving headers:
- machine/ipl.h -> sys/ipl.h - machine/mutex.h -> sys/mutex.h
Notes
Notes: svn path=/head/; revision=67365
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/an/if_an.c2
-rw-r--r--sys/dev/an/if_an_pccard.c2
-rw-r--r--sys/dev/an/if_an_pci.c2
-rw-r--r--sys/dev/dc/dcphy.c2
-rw-r--r--sys/dev/dc/pnphy.c2
-rw-r--r--sys/dev/fxp/if_fxp.c2
-rw-r--r--sys/dev/isp/isp_freebsd.h2
-rw-r--r--sys/dev/mii/dcphy.c2
-rw-r--r--sys/dev/mii/pnphy.c2
-rw-r--r--sys/dev/random/harvest.c2
-rw-r--r--sys/dev/random/yarrow.c2
11 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index 68a22a2e2e6b..e557d1f41c5e 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -107,7 +107,7 @@
#include <sys/bus.h>
#include <machine/bus.h>
#include <sys/rman.h>
-#include <machine/mutex.h>
+#include <sys/mutex.h>
#include <machine/resource.h>
#include <net/if.h>
diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c
index 551bad863d28..41b667267589 100644
--- a/sys/dev/an/if_an_pccard.c
+++ b/sys/dev/an/if_an_pccard.c
@@ -55,7 +55,7 @@
#include <sys/bus.h>
#include <machine/bus.h>
#include <sys/rman.h>
-#include <machine/mutex.h>
+#include <sys/mutex.h>
#include <machine/resource.h>
#include <net/if.h>
diff --git a/sys/dev/an/if_an_pci.c b/sys/dev/an/if_an_pci.c
index 22a0443ebdb2..bde0f3df9c5b 100644
--- a/sys/dev/an/if_an_pci.c
+++ b/sys/dev/an/if_an_pci.c
@@ -69,7 +69,7 @@
#include <sys/bus.h>
#include <machine/bus.h>
#include <sys/rman.h>
-#include <machine/mutex.h>
+#include <sys/mutex.h>
#include <machine/resource.h>
#include <net/if.h>
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index 285c2d3694c9..e991f0071c1a 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -47,6 +47,7 @@
#include <sys/socket.h>
#include <sys/errno.h>
#include <sys/module.h>
+#include <sys/mutex.h>
#include <sys/bus.h>
#include <net/if.h>
@@ -60,7 +61,6 @@
#include <machine/bus_pio.h>
#include <machine/bus_memio.h>
#include <machine/bus.h>
-#include <machine/mutex.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index e87e0be25e95..786be7ce10ad 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c
@@ -45,6 +45,7 @@
#include <sys/socket.h>
#include <sys/errno.h>
#include <sys/module.h>
+#include <sys/mutex.h>
#include <sys/bus.h>
#include <net/if.h>
@@ -58,7 +59,6 @@
#include <machine/bus_pio.h>
#include <machine/bus_memio.h>
#include <machine/bus.h>
-#include <machine/mutex.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 3b4afedacdc0..43c30b7070b6 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -38,6 +38,7 @@
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/malloc.h>
+#include <sys/mutex.h>
#include <sys/kernel.h>
#include <sys/socket.h>
@@ -56,7 +57,6 @@
#include <machine/bus.h>
#include <sys/rman.h>
#include <machine/resource.h>
-#include <machine/mutex.h>
#include <net/ethernet.h>
#include <net/if_arp.h>
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index c8db280d45bd..39eed5df4f93 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -40,6 +40,7 @@
#include <sys/kernel.h>
#include <sys/queue.h>
#include <sys/malloc.h>
+#include <sys/mutex.h>
#include <sys/proc.h>
#include <machine/bus_memio.h>
@@ -47,7 +48,6 @@
#include <machine/bus.h>
#include <machine/clock.h>
#include <machine/cpu.h>
-#include <machine/mutex.h>
#include <cam/cam.h>
#include <cam/cam_debug.h>
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index 285c2d3694c9..e991f0071c1a 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -47,6 +47,7 @@
#include <sys/socket.h>
#include <sys/errno.h>
#include <sys/module.h>
+#include <sys/mutex.h>
#include <sys/bus.h>
#include <net/if.h>
@@ -60,7 +61,6 @@
#include <machine/bus_pio.h>
#include <machine/bus_memio.h>
#include <machine/bus.h>
-#include <machine/mutex.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c
index e87e0be25e95..786be7ce10ad 100644
--- a/sys/dev/mii/pnphy.c
+++ b/sys/dev/mii/pnphy.c
@@ -45,6 +45,7 @@
#include <sys/socket.h>
#include <sys/errno.h>
#include <sys/module.h>
+#include <sys/mutex.h>
#include <sys/bus.h>
#include <net/if.h>
@@ -58,7 +59,6 @@
#include <machine/bus_pio.h>
#include <machine/bus_memio.h>
#include <machine/bus.h>
-#include <machine/mutex.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/random/harvest.c b/sys/dev/random/harvest.c
index 2f9ac2baa0c7..76c23a985108 100644
--- a/sys/dev/random/harvest.c
+++ b/sys/dev/random/harvest.c
@@ -31,11 +31,11 @@
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/kthread.h>
+#include <sys/mutex.h>
#include <sys/poll.h>
#include <sys/select.h>
#include <sys/random.h>
#include <sys/time.h>
-#include <machine/mutex.h>
#include <crypto/blowfish/blowfish.h>
#include <dev/random/hash.h>
diff --git a/sys/dev/random/yarrow.c b/sys/dev/random/yarrow.c
index fe4d160f7e92..004779eb77da 100644
--- a/sys/dev/random/yarrow.c
+++ b/sys/dev/random/yarrow.c
@@ -37,13 +37,13 @@
#include <sys/kthread.h>
#include <sys/libkern.h>
#include <sys/malloc.h>
+#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/select.h>
#include <sys/random.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/unistd.h>
-#include <machine/mutex.h>
#include <crypto/blowfish/blowfish.h>
#include <dev/random/hash.h>