diff --git a/[refs] b/[refs] index 638b5165732a..6ad4bec063e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89373de7dd010832d8b68cb37dabb33ff5a688bb +refs/heads/master: 9a168bddc2f13686336a86f8235b84347edac13a diff --git a/trunk/drivers/scsi/qla2xxx/qla_def.h b/trunk/drivers/scsi/qla2xxx/qla_def.h index acf40dcbfb30..1c6d366f4fad 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_def.h +++ b/trunk/drivers/scsi/qla2xxx/qla_def.h @@ -451,11 +451,9 @@ struct device_reg_2xxx { } u_end; }; -typedef struct { - union { +typedef union { struct device_reg_2xxx isp; struct device_reg_24xx isp24; - }; } device_reg_t; #define ISP_REQ_Q_IN(ha, reg) \