From e8ef572ad9d63dc96078bb4600a7ee63f6b05a58 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Thu, 15 Apr 2010 17:37:49 +0200
Subject: [PATCH] Remove the inclusion of <machine/bus_at386.h> from some WLAN
 drivers.

This file exists only on i386. Including it is not needed at all since
<sys/bus.h> on i386 already brings it in (via <machine/bus_dma.h>) and
also does the right thing in x86_64.

This fixes module building on x86_64.
---
 sys/dev/netif/ath/ath/if_ath.c     | 2 --
 sys/dev/netif/ath/ath/if_ath_pci.c | 2 --
 sys/dev/netif/ath/hal/ah_osdep.h   | 4 +---
 sys/dev/netif/ral/if_ral_pci.c     | 2 --
 sys/dev/netif/ral/rt2560.c         | 2 --
 sys/dev/netif/ral/rt2661.c         | 2 --
 sys/dev/netif/wi/if_wi.c           | 1 -
 sys/dev/netif/wi/if_wi_pccard.c    | 2 --
 sys/dev/netif/wi/if_wi_pci.c       | 2 --
 9 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/sys/dev/netif/ath/ath/if_ath.c b/sys/dev/netif/ath/ath/if_ath.c
index 97610863af..aa83d04170 100644
--- a/sys/dev/netif/ath/ath/if_ath.c
+++ b/sys/dev/netif/ath/ath/if_ath.c
@@ -59,8 +59,6 @@
 #include <sys/taskqueue.h>
 #include <sys/priv.h>
 
-#include <machine/bus_at386.h>
- 
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/netif/ath/ath/if_ath_pci.c b/sys/dev/netif/ath/ath/if_ath_pci.c
index 4ec1440568..669b2b8139 100644
--- a/sys/dev/netif/ath/ath/if_ath_pci.c
+++ b/sys/dev/netif/ath/ath/if_ath_pci.c
@@ -43,8 +43,6 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
-
-#include <machine/bus_at386.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/netif/ath/hal/ah_osdep.h b/sys/dev/netif/ath/hal/ah_osdep.h
index 8753399a4a..39f9e84aa5 100644
--- a/sys/dev/netif/ath/hal/ah_osdep.h
+++ b/sys/dev/netif/ath/hal/ah_osdep.h
@@ -33,14 +33,12 @@
 /*
  * Atheros Hardware Access Layer (HAL) OS Dependent Definitions.
  */
-#include <sys/cdefs.h>
+#include <sys/bus.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/endian.h>
 #include <sys/linker_set.h>
 
-#include <machine/bus_at386.h>
-
 /*
  * Bus i/o type definitions.
  */
diff --git a/sys/dev/netif/ral/if_ral_pci.c b/sys/dev/netif/ral/if_ral_pci.c
index 8551791f50..4cd9e731a2 100644
--- a/sys/dev/netif/ral/if_ral_pci.c
+++ b/sys/dev/netif/ral/if_ral_pci.c
@@ -33,8 +33,6 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/endian.h>
-
-#include <machine/bus_at386.h>
 #include <sys/rman.h>
 
 #include <net/bpf.h>
diff --git a/sys/dev/netif/ral/rt2560.c b/sys/dev/netif/ral/rt2560.c
index 8484da55e3..72fcc6f229 100644
--- a/sys/dev/netif/ral/rt2560.c
+++ b/sys/dev/netif/ral/rt2560.c
@@ -39,8 +39,6 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/endian.h>
-
-#include <machine/bus_at386.h>
 #include <sys/rman.h>
 
 #include <net/bpf.h>
diff --git a/sys/dev/netif/ral/rt2661.c b/sys/dev/netif/ral/rt2661.c
index 3d4b77c4c3..474f87308b 100644
--- a/sys/dev/netif/ral/rt2661.c
+++ b/sys/dev/netif/ral/rt2661.c
@@ -39,8 +39,6 @@
 #include <sys/bus.h>
 #include <sys/endian.h>
 #include <sys/fbsd_firmware.h>
-
-#include <machine/bus_at386.h>
 #include <sys/rman.h>
 
 #include <net/bpf.h>
diff --git a/sys/dev/netif/wi/if_wi.c b/sys/dev/netif/wi/if_wi.c
index b2ab11a6bc..6c22d3341c 100644
--- a/sys/dev/netif/wi/if_wi.c
+++ b/sys/dev/netif/wi/if_wi.c
@@ -80,7 +80,6 @@
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
 
-#include <machine/bus_at386.h>
 #include <machine/atomic.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/netif/wi/if_wi_pccard.c b/sys/dev/netif/wi/if_wi_pccard.c
index f0a25bf35a..91c17d6342 100644
--- a/sys/dev/netif/wi/if_wi_pccard.c
+++ b/sys/dev/netif/wi/if_wi_pccard.c
@@ -47,8 +47,6 @@
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-
-#include <machine/bus_at386.h>
 #include <sys/rman.h>
 
 #include <net/if.h>
diff --git a/sys/dev/netif/wi/if_wi_pci.c b/sys/dev/netif/wi/if_wi_pci.c
index 29e0bfd289..36499a7b0a 100644
--- a/sys/dev/netif/wi/if_wi_pci.c
+++ b/sys/dev/netif/wi/if_wi_pci.c
@@ -47,8 +47,6 @@
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-
-#include <machine/bus_at386.h>
 #include <sys/rman.h>
 
 #include <bus/pci/pcireg.h>
-- 
2.41.0