diff --git a/[refs] b/[refs] index c750ce54ff00..7b1848c6c7be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4651db97324b77972309fa22bc441dfbebb5b825 +refs/heads/master: 4b1d53f061bd3e622ba44c106e083a30a92eb223 diff --git a/trunk/drivers/staging/comedi/drivers/s526.c b/trunk/drivers/staging/comedi/drivers/s526.c index e5ee54332e8a..08666e637e47 100644 --- a/trunk/drivers/staging/comedi/drivers/s526.c +++ b/trunk/drivers/staging/comedi/drivers/s526.c @@ -112,7 +112,7 @@ static const int s526_ports[] = { REG_EEC }; -typedef struct { +struct counter_mode_register_t { unsigned short coutSource:1; unsigned short coutPolarity:1; unsigned short autoLoadResetRcap:3; @@ -124,10 +124,10 @@ typedef struct { unsigned short outputRegLatchCtrl:1; unsigned short preloadRegSel:1; unsigned short reserved:1; -} counter_mode_register_t; +}; union { - counter_mode_register_t reg; + struct counter_mode_register_t reg; unsigned short value; } cmReg;