diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index e31dc1bd5e51..bd0c673e98ee 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -250,8 +250,8 @@ SUBDIR=	\
 	${_mly} \
 	mmc \
 	mmcsd \
-	mpr \
-	mps \
+	${_mpr} \
+	${_mps} \
 	mpt \
 	mqueue \
 	mrsas \
@@ -523,6 +523,12 @@ _rtwnfw=	rtwnfw
 _cxgbe=		cxgbe
 .endif
 
+# These rely on 64bit atomics
+.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_CPUARCH} != "mips"
+_mps=		mps
+_mpr=		mpr
+.endif
+
 .if ${MK_TESTS} != "no" || defined(ALL_MODULES)
 SUBDIR+=	tests
 .endif
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index feb23b9866d6..2a5a3a865302 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -129,7 +129,6 @@ options 	AHC_ALLOW_MEMIO	# Attempt to use memory mapped I/O
 device		isp		# Qlogic family
 device		ispfw		# Firmware module for Qlogic host adapters
 device		mpt		# LSI-Logic MPT-Fusion
-device		mps		# LSI-Logic MPT-Fusion 2
 device		sym		# NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D
 
 # ATA/SCSI peripherals