diff --git a/sys/mips/atheros/files.ar71xx b/sys/mips/atheros/files.ar71xx
index 6ea527d24b0..9aefcb473aa 100644
--- a/sys/mips/atheros/files.ar71xx
+++ b/sys/mips/atheros/files.ar71xx
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-mips/atheros/apb.c		standard
+mips/atheros/apb.c		optional ar71xx_apb
 mips/atheros/ar71xx_gpio.c	optional gpio
 mips/atheros/ar71xx_machdep.c	standard
 mips/atheros/ar71xx_ehci.c	optional ehci
diff --git a/sys/mips/conf/AR71XX_BASE b/sys/mips/conf/AR71XX_BASE
index b652506d909..c94dd327d80 100644
--- a/sys/mips/conf/AR71XX_BASE
+++ b/sys/mips/conf/AR71XX_BASE
@@ -110,6 +110,8 @@ device		ar71xx_wdog
 device		uart
 device		uart_ar71xx
 
+device		ar71xx_apb
+
 device		loop
 device		ether
 device		md
diff --git a/sys/mips/conf/AR724X_BASE b/sys/mips/conf/AR724X_BASE
index bec11e29632..f0be92c9399 100644
--- a/sys/mips/conf/AR724X_BASE
+++ b/sys/mips/conf/AR724X_BASE
@@ -119,6 +119,8 @@ device		ar71xx_wdog
 device		uart
 device		uart_ar71xx
 
+device		ar71xx_apb
+
 device		loop
 device		ether
 device		md
diff --git a/sys/mips/conf/AR91XX_BASE b/sys/mips/conf/AR91XX_BASE
index 56085628913..b9dc435c20e 100644
--- a/sys/mips/conf/AR91XX_BASE
+++ b/sys/mips/conf/AR91XX_BASE
@@ -108,6 +108,8 @@ device		ar71xx_wdog
 device		uart
 device		uart_ar71xx
 
+device		ar71xx_apb
+
 device		loop
 device		ether
 device		md
diff --git a/sys/mips/conf/AR933X_BASE b/sys/mips/conf/AR933X_BASE
index 2b36371d1f5..ec8d2f9382c 100644
--- a/sys/mips/conf/AR933X_BASE
+++ b/sys/mips/conf/AR933X_BASE
@@ -113,6 +113,8 @@ device		ar71xx_wdog
 device		uart
 device		uart_ar933x
 
+device		ar71xx_apb
+
 device		loop
 device		ether
 device		md
diff --git a/sys/mips/conf/AR934X_BASE b/sys/mips/conf/AR934X_BASE
index 442a6816215..d7be4ee057c 100644
--- a/sys/mips/conf/AR934X_BASE
+++ b/sys/mips/conf/AR934X_BASE
@@ -117,6 +117,9 @@ device		ar71xx_wdog
 device		uart
 device		uart_ar71xx
 
+# XXX for now; later a separate APB mux is needed to demux PCI/WLAN interrupts.
+device		ar71xx_apb
+
 device		loop
 device		ether
 device		md
diff --git a/sys/mips/conf/PB92 b/sys/mips/conf/PB92
index b634caeaf00..fd5609ca870 100644
--- a/sys/mips/conf/PB92
+++ b/sys/mips/conf/PB92
@@ -126,6 +126,8 @@ device		ar71xx_wdog
 device		uart
 device		uart_ar71xx
 
+device		ar71xx_apb
+
 # Network twiddling
 device		loop
 device		ether