Pre 4.0 tidy up.

Collect together the components of several drivers and export eisa from
the i386-only area (It's not, it's on some alphas too).  The code hasn't
been updated to work on the Alpha yet, but that can come later.

Repository copies were done a while ago.
Moving these now keeps them in consistant place across the 4.x series
as the newbusification progresses.

Submitted by:   mdodd

11 files changed, 15 insertions, 14 deletions

diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index ad9604e..9caf574 100644
--- a/sys/dev/advansys/adv_eisa.c
+++ b/sys/dev/advansys/adv_eisa.c
@@ -49,7 +49,7 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <i386/eisa/eisaconf.h>
+#include <dev/eisa/eisaconf.h>
 
 #include <dev/advansys/advansys.h>
 
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index 67eead4..4b432a9 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -53,9 +53,9 @@
 
 #include <cam/scsi/scsi_message.h>
 
-#include <i386/eisa/eisaconf.h>
+#include <dev/eisa/eisaconf.h>
 
-#include <i386/eisa/ahbreg.h>
+#include <dev/ahb/ahbreg.h>
 
 #define ccb_ecb_ptr spriv_ptr0
 #define ccb_ahb_ptr spriv_ptr1
diff --git a/sys/dev/aic7xxx/ahc_eisa.c b/sys/dev/aic7xxx/ahc_eisa.c
index e98be7d..c8805fe 100644
--- a/sys/dev/aic7xxx/ahc_eisa.c
+++ b/sys/dev/aic7xxx/ahc_eisa.c
@@ -43,7 +43,7 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <i386/eisa/eisaconf.h>
+#include <dev/eisa/eisaconf.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c
index 400b42b..e24409b 100644
--- a/sys/dev/buslogic/bt_eisa.c
+++ b/sys/dev/buslogic/bt_eisa.c
@@ -43,7 +43,7 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <i386/eisa/eisaconf.h>
+#include <dev/eisa/eisaconf.h>
 
 #include <dev/buslogic/btreg.h>
 
diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c
index 67b77d1..bd98bfa 100644
--- a/sys/dev/dpt/dpt_eisa.c
+++ b/sys/dev/dpt/dpt_eisa.c
@@ -58,7 +58,7 @@
 
 #include <dev/dpt/dpt.h>
 
-#include <i386/eisa/eisaconf.h>
+#include <dev/eisa/eisaconf.h>
 
 #include <machine/clock.h>
 
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 59f553a..1e9dcda 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -46,7 +46,7 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <i386/eisa/eisaconf.h>
+#include <dev/eisa/eisaconf.h>
 
 typedef struct resvaddr {
         u_long	addr;				/* start address */
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index ee1a50f..b8bc31d 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -40,7 +40,7 @@
 
 #include <machine/clock.h>
 
-#include <i386/eisa/eisaconf.h>
+#include <dev/eisa/eisaconf.h>
 
 #include <dev/ep/if_epreg.h>
 #include <dev/ep/if_epvar.h>
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 6a09445..40ad5b5 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -68,7 +68,7 @@
 #include <isa/isavar.h>
 #include <isa/pnpvar.h>
 
-#include <i386/isa/if_exreg.h>
+#include <dev/ex/if_exreg.h>
 
 #ifdef EXDEBUG
 # define Start_End 1
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index fbbb801..dbb8f7e 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -136,9 +136,9 @@ iomem and and with 0xffff.
 #include <i386/isa/isa_device.h>
 #include <i386/isa/ic/i82586.h>
 #include <i386/isa/icu.h>
-#include <i386/isa/if_iereg.h>
-#include <i386/isa/if_ie507.h>
-#include <i386/isa/if_iee16.h>
+#include <dev/ie/if_iereg.h>
+#include <dev/ie/if_ie507.h>
+#include <dev/ie/if_iee16.h>
 #include <i386/isa/elink.h>
 
 #include <net/bpf.h>
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index 21c90d4..dc90631 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -43,7 +43,7 @@
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/rman.h> 
-#include <i386/eisa/eisaconf.h>
+#include <dev/eisa/eisaconf.h>
 #include <dev/pdq/pdqvar.h>
 #include <dev/pdq/pdqreg.h>
 
diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c
index 150e573..c700eb3 100644
--- a/sys/dev/vx/if_vx_eisa.c
+++ b/sys/dev/vx/if_vx_eisa.c
@@ -26,6 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $FreeBSD$
  */
 
 #include "eisa.h"
@@ -48,7 +49,7 @@
 #include <net/if.h>
 #include <net/if_arp.h>
 
-#include <i386/eisa/eisaconf.h>
+#include <dev/eisa/eisaconf.h>
 
 #include <dev/vx/if_vxreg.h>