---

yaml --- r: 364195 b: refs/heads/master c: 264601c h: refs/heads/master i: 364193: 3e0fa0e 364191: 2b8827c v: v3
git-mirror · Apr 23, 2013 · 263872c · 263872c
1 parent ba16e9c
commit 263872c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57d1ebf795a3cdde46ee30e4ad77b4ae02fa1569
+refs/heads/master: 264601c231c9c9dec3da2c665c0b9cbec11d8c9e
diff --git a/trunk/drivers/staging/comedi/drivers/das800.c b/trunk/drivers/staging/comedi/drivers/das800.c
@@ -453,11 +453,6 @@ static int das800_ai_do_cmd(struct comedi_device *dev,
 	case TRIG_TIMER:
 		conv_bits |= CASC | ITE;
 		/* set conversion frequency */
-		i8253_cascade_ns_to_timer_2div(TIMER_BASE, &(devpriv->divisor1),
-					       &(devpriv->divisor2),
-					       &(async->cmd.convert_arg),
-					       async->cmd.
-					       flags & TRIG_ROUND_MASK);
 		if (das800_set_frequency(dev) < 0) {
 			comedi_error(dev, "Error setting up counters");
 			return -1;