diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 8bf481a55c89..0fa1a709dcba 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -376,6 +376,10 @@ device		hptmv
 # acceleration assistance for RAID_5.
 device		rr232x
 
+#
+# Highpoint RocketRaid 3xxx series SATA RAID
+device		hptiop
+
 #
 # IBM (now Adaptec) ServeRAID controllers
 device		ips
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 78c76de5d9fd..96dfe9aa5675 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1433,7 +1433,6 @@ options 	SC_NO_SUSPEND_VTYSWITCH
 # bt:  Most Buslogic controllers: including BT-445, BT-54x, BT-64x, BT-74x,
 #      BT-75x, BT-946, BT-948, BT-956, BT-958, SDC3211B, SDC3211F, SDC3222F
 # esp: NCR53c9x.  Only for SBUS hardware right now.
-# hptiop: Highpoint RocketRaid 3xxx series SATA RAID
 # isp: Qlogic ISP 1020, 1040 and 1040B PCI SCSI host adapters,
 #      ISP 1240 Dual Ultra SCSI, ISP 1080 and 1280 (Dual) Ultra2,
 #      ISP 12160 Ultra3 SCSI,
@@ -1470,7 +1469,6 @@ device		ahc
 device		ahd
 device		amd
 device		esp
-device		hptiop
 device		isp
 hint.isp.0.disable="1"
 hint.isp.0.role="3"
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index dacde338cdfd..2e7c1816c554 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -733,6 +733,10 @@ device		hptmv
 # acceleration assistance for RAID_5.
 device		rr232x
 
+#
+# Highpoint RocketRaid 3xxx series SATA RAID
+device		hptiop
+
 #
 # IBM (now Adaptec) ServeRAID controllers
 device		ips
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 7d0adde009bf..748a92e5604e 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -93,8 +93,8 @@ SUBDIR=	${_3dfx} \
 	${_hfa} \
 	hifn \
 	hme \
+	${_hptiop} \
 	${_hptmv} \
-	hptiop \
 	hwpmc \
 	${_i2c} \
 	${_ibcs2} \
@@ -426,6 +426,7 @@ _ctau=		ctau
 _cx=		cx
 _dpt=		dpt
 _ex=		ex
+_hptiop=	hptiop
 _hptmv=		hptmv
 _ichwd=		ichwd
 _ida=		ida
@@ -478,6 +479,7 @@ _ed=		ed
 _em=		em
 _exca=		exca
 _ext2fs=	ext2fs
+_hptiop=	hptiop
 _hptmv=		hptmv
 _i2c=		i2c
 _ichwd=		ichwd