diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -90,19 +90,6 @@
 
 options 	BPF_JITTER
 
-# OpenFabrics Enterprise Distribution (Infiniband).
-options 	OFED
-options 	OFED_DEBUG_INIT
-
-# Sockets Direct Protocol
-options 	SDP
-options 	SDP_DEBUG
-
-# IP over Infiniband
-options 	IPOIB
-options 	IPOIB_DEBUG
-options 	IPOIB_CM
-
 
 #####################################################################
 # CLOCK OPTIONS
diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES
--- a/sys/arm/conf/NOTES
+++ b/sys/arm/conf/NOTES
@@ -74,6 +74,11 @@
 nooptions	PPC_PROBE_CHIPSET
 nooptions	MAXCPU		# value is set in machine/param.h
 
+nooptions 	OFED
+nooptions 	SDP
+nooptions 	IPOIB
+nooptions 	IPOIB_CM
+
 nodevice	sym
 
 nodevice	ccr
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -771,6 +771,19 @@
 options 	SCTP_LTRACE_CHUNKS
 options 	SCTP_LTRACE_ERRORS
 
+# OpenFabrics Enterprise Distribution (Infiniband).
+options 	OFED
+options 	OFED_DEBUG_INIT
+
+# Sockets Direct Protocol
+options 	SDP
+options 	SDP_DEBUG
+
+# IP over Infiniband
+options 	IPOIB
+options 	IPOIB_DEBUG
+options 	IPOIB_CM
+
 # altq(9). Enable the base part of the hooks with the ALTQ option.
 # Individual disciplines must be built into the base system and can not be
 # loaded as modules at this point. ALTQ requires a stable TSC so if yours is
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -238,19 +238,6 @@
 
 options 	BPF_JITTER
 
-# OpenFabrics Enterprise Distribution (Infiniband).
-options 	OFED
-options 	OFED_DEBUG_INIT
-
-# Sockets Direct Protocol
-options 	SDP
-options 	SDP_DEBUG
-
-# IP over Infiniband
-options 	IPOIB
-options 	IPOIB_DEBUG
-options 	IPOIB_CM
-
 
 #####################################################################
 # CLOCK OPTIONS