Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[pandora-kernel.git] / drivers / scsi / qla2xxx / qla_def.h

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index acf40dc..1c6d366 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/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) \