diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/addi_common.h | 8 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h index fe98981e754..60e7291e496 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h @@ -201,9 +201,9 @@ struct addi_board { struct comedi_insn *insn, unsigned int *data); }; -//MODULE INFO STRUCTURE +/* MODULE INFO STRUCTURE */ -typedef union { +union str_ModuleInfo { /* Incremental counter infos */ struct { union { @@ -342,7 +342,7 @@ typedef union { unsigned char b_CDAReadFIFOOverflow; } s_CDAModuleInfo; -} str_ModuleInfo; +}; /* Private structure for the addi_apci3120 driver */ typedef struct { @@ -431,7 +431,7 @@ typedef struct { } s_FIFOInterruptParameters[APCI1710_SAVE_INTERRUPT]; } s_InterruptParameters; - str_ModuleInfo s_ModuleInfo[4]; + union str_ModuleInfo s_ModuleInfo[4]; unsigned int ul_TTLPortConfiguration[10]; } addi_private; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c index c79bf473220..098cd792e03 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c @@ -261,7 +261,7 @@ void v_APCI1710_Interrupt(int irq, void *d) unsigned int ul_82X54InterruptStatus; unsigned int ul_StatusRegister; - str_ModuleInfo *ps_ModuleInfo; + union str_ModuleInfo *ps_ModuleInfo; printk("APCI1710 Interrupt\n"); for (b_ModuleCpt = 0; b_ModuleCpt < 4; b_ModuleCpt++, ps_ModuleInfo++) { |