diff --git a/[refs] b/[refs] index 61435a73368f..bf61423bdfcf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 215040e1238fa18caf5edf9bcd68126ecd8a6b2d +refs/heads/master: d1e1501e3129f215ec182bb0c69305655d429f80 diff --git a/trunk/drivers/staging/comedi/drivers/ni_tio.c b/trunk/drivers/staging/comedi/drivers/ni_tio.c index 98f87897e2a8..225287769dc1 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_tio.c +++ b/trunk/drivers/staging/comedi/drivers/ni_tio.c @@ -276,7 +276,7 @@ static inline unsigned NI_660x_RTSI_Second_Gate_Select(unsigned n) } static const unsigned int counter_status_mask = - COMEDI_COUNTER_ARMED | COMEDI_COUNTER_COUNTING; + COMEDI_COUNTER_ARMED | COMEDI_COUNTER_COUNTING; static int __init ni_tio_init_module(void) {