3 files changed, 24 insertions, 12 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 4dd1918803e5..ba01fd290449 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1637,8 +1637,9 @@ device		pci
 # self-contained SCSI host adapters.
 #
 # The `isp' device provides support for the Qlogic ISP 1020, 1040
-# nd 1040B PCI SCSI host adapters, as well as the Qlogic ISP 2100
-# FC/AL Host Adapter.
+# nd 1040B PCI SCSI host adapters, ISP 1240 Dual Ultra SCSI,
+# ISP 1080 and 1280 (Dual) Ultra2, ISP 12160 Ultra3 SCSI, as well as
+# the Qlogic ISP 2100 and ISP 2200 Fibre Channel Host Adapters.
 #
 # The `dc' device provides support for PCI fast ethernet adapters
 # based on the DEC/Intel 21143 and various workalikes including:
@@ -1818,13 +1819,15 @@ device		sym		# NCR/Symbios Logic (newer chipsets)
 #
 #	ISP_DISABLE_1020_SUPPORT	Disable support for 1020/1040 cards
 #	ISP_DISABLE_1080_SUPPORT	Disable support for 1080/1240 cards
+#	ISP_DISABLE_12160_SUPPORT	Disable support for 12160 cards
 #	ISP_DISABLE_2100_SUPPORT	Disable support for 2100 cards
-#	(these really just to save code space)
-#	(use of all three will cause the driver to not compile)
+#	(these really just to save some code space)
+#	(use of all four will cause the kernel to not compile)
 #
 #	ISP_COMPILE_FW		-	compile all firmware in
 #	ISP_COMPILE_1020_FW	-	compile in 1020/1040 firmware
 #	ISP_COMPILE_1080_FW	-	compile in 1080/1240/1280 firmware
+#	ISP_COMPILE_12160_FW	-	compile in 12160 firmware
 #	ISP_COMPILE_2100_FW	-	compile in 2100 firmware
 #	ISP_COMPILE_2200_FW	-	compile in 2200 firmware
 #
@@ -1838,6 +1841,7 @@ options 	SCSI_ISP_FCDUPLEX=0x4		# isp2 is a Fibre Channel card
 options 	SCSI_ISP_WWN="0x5000000099990000"
 #options 	ISP_DISABLE_1020_SUPPORT
 #options 	ISP_DISABLE_1080_SUPPORT
+#options 	ISP_DISABLE_12160_SUPPORT
 #options 	ISP_DISABLE_2100_SUPPORT
 #options 	ISP_COMPILE_1020_FW=1
 #options 	ISP_COMPILE_1080_FW=1
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 4dd1918803e5..ba01fd290449 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -1637,8 +1637,9 @@ device		pci
 # self-contained SCSI host adapters.
 #
 # The `isp' device provides support for the Qlogic ISP 1020, 1040
-# nd 1040B PCI SCSI host adapters, as well as the Qlogic ISP 2100
-# FC/AL Host Adapter.
+# nd 1040B PCI SCSI host adapters, ISP 1240 Dual Ultra SCSI,
+# ISP 1080 and 1280 (Dual) Ultra2, ISP 12160 Ultra3 SCSI, as well as
+# the Qlogic ISP 2100 and ISP 2200 Fibre Channel Host Adapters.
 #
 # The `dc' device provides support for PCI fast ethernet adapters
 # based on the DEC/Intel 21143 and various workalikes including:
@@ -1818,13 +1819,15 @@ device		sym		# NCR/Symbios Logic (newer chipsets)
 #
 #	ISP_DISABLE_1020_SUPPORT	Disable support for 1020/1040 cards
 #	ISP_DISABLE_1080_SUPPORT	Disable support for 1080/1240 cards
+#	ISP_DISABLE_12160_SUPPORT	Disable support for 12160 cards
 #	ISP_DISABLE_2100_SUPPORT	Disable support for 2100 cards
-#	(these really just to save code space)
-#	(use of all three will cause the driver to not compile)
+#	(these really just to save some code space)
+#	(use of all four will cause the kernel to not compile)
 #
 #	ISP_COMPILE_FW		-	compile all firmware in
 #	ISP_COMPILE_1020_FW	-	compile in 1020/1040 firmware
 #	ISP_COMPILE_1080_FW	-	compile in 1080/1240/1280 firmware
+#	ISP_COMPILE_12160_FW	-	compile in 12160 firmware
 #	ISP_COMPILE_2100_FW	-	compile in 2100 firmware
 #	ISP_COMPILE_2200_FW	-	compile in 2200 firmware
 #
@@ -1838,6 +1841,7 @@ options 	SCSI_ISP_FCDUPLEX=0x4		# isp2 is a Fibre Channel card
 options 	SCSI_ISP_WWN="0x5000000099990000"
 #options 	ISP_DISABLE_1020_SUPPORT
 #options 	ISP_DISABLE_1080_SUPPORT
+#options 	ISP_DISABLE_12160_SUPPORT
 #options 	ISP_DISABLE_2100_SUPPORT
 #options 	ISP_COMPILE_1020_FW=1
 #options 	ISP_COMPILE_1080_FW=1
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 4dd1918803e5..ba01fd290449 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1637,8 +1637,9 @@ device		pci
 # self-contained SCSI host adapters.
 #
 # The `isp' device provides support for the Qlogic ISP 1020, 1040
-# nd 1040B PCI SCSI host adapters, as well as the Qlogic ISP 2100
-# FC/AL Host Adapter.
+# nd 1040B PCI SCSI host adapters, ISP 1240 Dual Ultra SCSI,
+# ISP 1080 and 1280 (Dual) Ultra2, ISP 12160 Ultra3 SCSI, as well as
+# the Qlogic ISP 2100 and ISP 2200 Fibre Channel Host Adapters.
 #
 # The `dc' device provides support for PCI fast ethernet adapters
 # based on the DEC/Intel 21143 and various workalikes including:
@@ -1818,13 +1819,15 @@ device		sym		# NCR/Symbios Logic (newer chipsets)
 #
 #	ISP_DISABLE_1020_SUPPORT	Disable support for 1020/1040 cards
 #	ISP_DISABLE_1080_SUPPORT	Disable support for 1080/1240 cards
+#	ISP_DISABLE_12160_SUPPORT	Disable support for 12160 cards
 #	ISP_DISABLE_2100_SUPPORT	Disable support for 2100 cards
-#	(these really just to save code space)
-#	(use of all three will cause the driver to not compile)
+#	(these really just to save some code space)
+#	(use of all four will cause the kernel to not compile)
 #
 #	ISP_COMPILE_FW		-	compile all firmware in
 #	ISP_COMPILE_1020_FW	-	compile in 1020/1040 firmware
 #	ISP_COMPILE_1080_FW	-	compile in 1080/1240/1280 firmware
+#	ISP_COMPILE_12160_FW	-	compile in 12160 firmware
 #	ISP_COMPILE_2100_FW	-	compile in 2100 firmware
 #	ISP_COMPILE_2200_FW	-	compile in 2200 firmware
 #
@@ -1838,6 +1841,7 @@ options 	SCSI_ISP_FCDUPLEX=0x4		# isp2 is a Fibre Channel card
 options 	SCSI_ISP_WWN="0x5000000099990000"
 #options 	ISP_DISABLE_1020_SUPPORT
 #options 	ISP_DISABLE_1080_SUPPORT
+#options 	ISP_DISABLE_12160_SUPPORT
 #options 	ISP_DISABLE_2100_SUPPORT
 #options 	ISP_COMPILE_1020_FW=1
 #options 	ISP_COMPILE_1080_FW=1