From 3d11ce04c673f5f2a6466bb3c49ff79ae6234451 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 23 Aug 2003 00:11:16 +0000
Subject: [PATCH] s=include <ofw/=include <dev/ofw/= to reflect removal of
 -I$S/dev

---
 sys/dev/hfa/hfa_sbus.c            | 2 +-
 sys/dev/hme/if_hme_sbus.c         | 2 +-
 sys/dev/isp/isp_sbus.c            | 2 +-
 sys/dev/sab/sab.c                 | 2 +-
 sys/dev/sio/sio_ebus.c            | 2 +-
 sys/dev/zs/zs_macio.c             | 2 +-
 sys/dev/zs/zs_sbus.c              | 2 +-
 sys/sparc64/ebus/ebus.c           | 4 ++--
 sys/sparc64/isa/isa.c             | 4 ++--
 sys/sparc64/isa/ofw_isa.c         | 4 ++--
 sys/sparc64/pci/psycho.c          | 4 ++--
 sys/sparc64/sbus/sbus.c           | 2 +-
 sys/sparc64/sparc64/eeprom.c      | 2 +-
 sys/sparc64/sparc64/eeprom_ebus.c | 2 +-
 sys/sparc64/sparc64/eeprom_fhc.c  | 2 +-
 sys/sparc64/sparc64/eeprom_sbus.c | 2 +-
 sys/sparc64/sparc64/ofw_bus.c     | 2 +-
 sys/sparc64/sparc64/ofw_machdep.c | 2 +-
 18 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/sys/dev/hfa/hfa_sbus.c b/sys/dev/hfa/hfa_sbus.c
index c882111d5ef..3e769d2215a 100644
--- a/sys/dev/hfa/hfa_sbus.c
+++ b/sys/dev/hfa/hfa_sbus.c
@@ -73,7 +73,7 @@
 
 #include <sys/rman.h> 
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <sparc64/sbus/sbusreg.h>
 #include <sparc64/sbus/sbusvar.h>
diff --git a/sys/dev/hme/if_hme_sbus.c b/sys/dev/hme/if_hme_sbus.c
index 782c41ffb13..8acba124609 100644
--- a/sys/dev/hme/if_hme_sbus.c
+++ b/sys/dev/hme/if_hme_sbus.c
@@ -55,7 +55,7 @@
 
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c
index 47bb9ef0f12..30b022501ba 100644
--- a/sys/dev/isp/isp_sbus.c
+++ b/sys/dev/isp/isp_sbus.c
@@ -37,7 +37,7 @@
 #include <machine/ofw_machdep.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 #include <sparc64/sbus/sbusvar.h>
 
 #include <dev/isp/isp_freebsd.h>
diff --git a/sys/dev/sab/sab.c b/sys/dev/sab/sab.c
index 8989a2fda1b..fbdc5b7bd84 100644
--- a/sys/dev/sab/sab.c
+++ b/sys/dev/sab/sab.c
@@ -63,7 +63,7 @@
 
 #include <ddb/ddb.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 #include <sparc64/ebus/ebusvar.h>
 
 #include <dev/sab/sab82532reg.h>
diff --git a/sys/dev/sio/sio_ebus.c b/sys/dev/sio/sio_ebus.c
index 2a389387b99..54f1c9361c3 100644
--- a/sys/dev/sio/sio_ebus.c
+++ b/sys/dev/sio/sio_ebus.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/sio/siovar.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 #include <sparc64/ebus/ebusvar.h>
 
 int	sio_ofw_inlist(char *name, char *list[]);
diff --git a/sys/dev/zs/zs_macio.c b/sys/dev/zs/zs_macio.c
index 367c563f639..21746cdd045 100644
--- a/sys/dev/zs/zs_macio.c
+++ b/sys/dev/zs/zs_macio.c
@@ -35,7 +35,7 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 #include <powerpc/powermac/maciovar.h>
 
 #include <dev/zs/z8530reg.h>
diff --git a/sys/dev/zs/zs_sbus.c b/sys/dev/zs/zs_sbus.c
index a1b266637fb..f76d59a3f9b 100644
--- a/sys/dev/zs/zs_sbus.c
+++ b/sys/dev/zs/zs_sbus.c
@@ -36,7 +36,7 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <sparc64/fhc/fhcreg.h>
 #include <sparc64/fhc/fhcvar.h>
diff --git a/sys/sparc64/ebus/ebus.c b/sys/sparc64/ebus/ebus.c
index 3ed6bbdcdbb..247a4d3c011 100644
--- a/sys/sparc64/ebus/ebus.c
+++ b/sys/sparc64/ebus/ebus.c
@@ -56,8 +56,8 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 
-#include <ofw/openfirm.h>
-#include <ofw/ofw_pci.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_pci.h>
 
 #include <machine/bus.h>
 #include <machine/ofw_bus.h>
diff --git a/sys/sparc64/isa/isa.c b/sys/sparc64/isa/isa.c
index 1ec1f90ff8f..502e9b1aed7 100644
--- a/sys/sparc64/isa/isa.c
+++ b/sys/sparc64/isa/isa.c
@@ -49,8 +49,8 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-#include <ofw/ofw_pci.h>
-#include <ofw/openfirm.h>
+#include <dev/ofw/ofw_pci.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/intr_machdep.h>
 #include <machine/ofw_bus.h>
diff --git a/sys/sparc64/isa/ofw_isa.c b/sys/sparc64/isa/ofw_isa.c
index 986220d4b7a..b5e746c22c9 100644
--- a/sys/sparc64/isa/ofw_isa.c
+++ b/sys/sparc64/isa/ofw_isa.c
@@ -41,8 +41,8 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <ofw/openfirm.h>
-#include <ofw/ofw_pci.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_pci.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index 773ce7c2da5..2752ca47985 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -46,8 +46,8 @@
 #include <sys/malloc.h>
 #include <sys/pcpu.h>
 
-#include <ofw/openfirm.h>
-#include <ofw/ofw_pci.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_pci.h>
 
 #include <machine/bus.h>
 #include <machine/bus_private.h>
diff --git a/sys/sparc64/sbus/sbus.c b/sys/sparc64/sbus/sbus.c
index 028933e2d69..3d4e110faee 100644
--- a/sys/sparc64/sbus/sbus.c
+++ b/sys/sparc64/sbus/sbus.c
@@ -114,7 +114,7 @@
 #include <sys/pcpu.h>
 #include <sys/reboot.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
 #include <machine/bus_private.h>
diff --git a/sys/sparc64/sparc64/eeprom.c b/sys/sparc64/sparc64/eeprom.c
index 523dfbd8182..83db53dcc33 100644
--- a/sys/sparc64/sparc64/eeprom.c
+++ b/sys/sparc64/sparc64/eeprom.c
@@ -67,7 +67,7 @@
 
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/eeprom.h>
 
diff --git a/sys/sparc64/sparc64/eeprom_ebus.c b/sys/sparc64/sparc64/eeprom_ebus.c
index 237cf2f2716..211878fc2da 100644
--- a/sys/sparc64/sparc64/eeprom_ebus.c
+++ b/sys/sparc64/sparc64/eeprom_ebus.c
@@ -67,7 +67,7 @@
 
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/eeprom.h>
 
diff --git a/sys/sparc64/sparc64/eeprom_fhc.c b/sys/sparc64/sparc64/eeprom_fhc.c
index 2dffc9f9c49..d4535a1e5e6 100644
--- a/sys/sparc64/sparc64/eeprom_fhc.c
+++ b/sys/sparc64/sparc64/eeprom_fhc.c
@@ -67,7 +67,7 @@
 
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/eeprom.h>
 
diff --git a/sys/sparc64/sparc64/eeprom_sbus.c b/sys/sparc64/sparc64/eeprom_sbus.c
index e98c43b75aa..49116394d95 100644
--- a/sys/sparc64/sparc64/eeprom_sbus.c
+++ b/sys/sparc64/sparc64/eeprom_sbus.c
@@ -67,7 +67,7 @@
 
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/eeprom.h>
 
diff --git a/sys/sparc64/sparc64/ofw_bus.c b/sys/sparc64/sparc64/ofw_bus.c
index 359da418106..6c894b6a4f1 100644
--- a/sys/sparc64/sparc64/ofw_bus.c
+++ b/sys/sparc64/sparc64/ofw_bus.c
@@ -70,7 +70,7 @@
 #include <sys/malloc.h>
 #include <sys/systm.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/ofw_bus.h>
 
diff --git a/sys/sparc64/sparc64/ofw_machdep.c b/sys/sparc64/sparc64/ofw_machdep.c
index 13be00511b1..9cd4c02e73d 100644
--- a/sys/sparc64/sparc64/ofw_machdep.c
+++ b/sys/sparc64/sparc64/ofw_machdep.c
@@ -34,7 +34,7 @@
 
 #include <net/ethernet.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/idprom.h>
 #include <machine/ofw_machdep.h>