summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla1280.h
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2024-12-02 12:36:18 -0500
committerMartin K. Petersen <martin.petersen@oracle.com>2024-12-02 12:36:18 -0500
commite7d3b4079d01c60568a45237224df4447f140189 (patch)
tree23faea3aca75215065e0e49d379fa349a0070d5a /drivers/scsi/qla1280.h
parent40384c840ea1944d7c5a392e8975ed088ecf0b37 (diff)
parent019880c08d059f214327fd0dc92e9be3707286f2 (diff)
downloadlinux-stable-e7d3b4079d01c60568a45237224df4447f140189.tar.gz
linux-stable-e7d3b4079d01c60568a45237224df4447f140189.tar.bz2
linux-stable-e7d3b4079d01c60568a45237224df4447f140189.zip
Merge branch '6.13/scsi-queue' into 6.13/scsi-fixes
Pull in outstanding changes from 6.13/scsi-queue. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/qla1280.h')
-rw-r--r--drivers/scsi/qla1280.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/qla1280.h b/drivers/scsi/qla1280.h
index d309e2ca14de..dea2290b37d4 100644
--- a/drivers/scsi/qla1280.h
+++ b/drivers/scsi/qla1280.h
@@ -116,12 +116,12 @@ struct device_reg {
uint16_t id_h; /* ID high */
uint16_t cfg_0; /* Configuration 0 */
#define ISP_CFG0_HWMSK 0x000f /* Hardware revision mask */
-#define ISP_CFG0_1020 BIT_0 /* ISP1020 */
-#define ISP_CFG0_1020A BIT_1 /* ISP1020A */
-#define ISP_CFG0_1040 BIT_2 /* ISP1040 */
-#define ISP_CFG0_1040A BIT_3 /* ISP1040A */
-#define ISP_CFG0_1040B BIT_4 /* ISP1040B */
-#define ISP_CFG0_1040C BIT_5 /* ISP1040C */
+#define ISP_CFG0_1020 1 /* ISP1020 */
+#define ISP_CFG0_1020A 2 /* ISP1020A */
+#define ISP_CFG0_1040 3 /* ISP1040 */
+#define ISP_CFG0_1040A 4 /* ISP1040A */
+#define ISP_CFG0_1040B 5 /* ISP1040B */
+#define ISP_CFG0_1040C 6 /* ISP1040C */
uint16_t cfg_1; /* Configuration 1 */
#define ISP_CFG1_F128 BIT_6 /* 128-byte FIFO threshold */
#define ISP_CFG1_F64 BIT_4|BIT_5 /* 128-byte FIFO threshold */