diff --git a/[refs] b/[refs] index 63672527215c..a18dd9b07818 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1a5917157c115875d71c94fac75071a8b88ba15 +refs/heads/master: 808cea5a5d538d787f42e2ec48527bfb7e830490 diff --git a/trunk/drivers/staging/comedi/drivers/das800.c b/trunk/drivers/staging/comedi/drivers/das800.c index e2bd371114be..4c28b383869d 100644 --- a/trunk/drivers/staging/comedi/drivers/das800.c +++ b/trunk/drivers/staging/comedi/drivers/das800.c @@ -225,11 +225,11 @@ static const struct das800_board das800_boards[] = { }; struct das800_private { - volatile unsigned int count; /* number of data points left to be taken */ - volatile int forever; /* flag indicating whether we should take data forever */ - unsigned int divisor1; /* value to load into board's counter 1 for timed conversions */ - unsigned int divisor2; /* value to load into board's counter 2 for timed conversions */ - volatile int do_bits; /* digital output bits */ + unsigned int count; /* number of data points left to be taken */ + int forever; /* flag that we should take data forever */ + unsigned int divisor1; /* counter 1 value for timed conversions */ + unsigned int divisor2; /* counter 2 value for timed conversions */ + int do_bits; /* digital output bits */ }; static void das800_ind_write(struct comedi_device *dev,