diff --git a/sys/dev/axgbe/if_axgbe_pci.c b/sys/dev/axgbe/if_axgbe_pci.c
index 5cb841ec112..104109a27e3 100644
--- a/sys/dev/axgbe/if_axgbe_pci.c
+++ b/sys/dev/axgbe/if_axgbe_pci.c
@@ -1642,7 +1642,7 @@ axgbe_if_rx_queues_alloc(if_ctx_t ctx, caddr_t *va, uint64_t *pa, int nrxqs,
 
        MPASS(scctx->isc_nrxqsets > 0);
        MPASS(scctx->isc_nrxqsets == nrxqsets);
-       MPASS(nrxqs == 1);
+       MPASS(nrxqs == 2);
 
        axgbe_printf(1, "%s: rxqsets %d/%d rxqs %d\n", __func__,
            scctx->isc_nrxqsets, nrxqsets, nrxqs);      
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 35f491d251f..ccd119c795b 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -59,6 +59,7 @@ SUBDIR=       \
        ath_rate \
        ath_pci \
        ${_autofs} \
+       axgbe \
        ${_bce} \
        ${_bcm283x_clkman} \
        ${_bcm283x_pwm} \
diff --git a/sys/modules/axgbe/Makefile b/sys/modules/axgbe/Makefile
index b204ff7d046..9bf694ef2e3 100644
--- a/sys/modules/axgbe/Makefile
+++ b/sys/modules/axgbe/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
-SUBDIR= if_axa if_axp
+.if ${MACHINE_CPUARCH} == "aarch64"
+SUBDIR= if_axa
+.elif ${MACHINE_CPUARCH} == "amd64"
+SUBDIR= if_axp
+.endif
 
 .include <bsd.subdir.mk>