From 31e75293662ddd93ffa3594e0fdf461d9795614a Mon Sep 17 00:00:00 2001
From: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
Date: Thu, 26 Apr 2012 15:32:18 +0530
Subject: [PATCH] --- yaml --- r: 304527 b: refs/heads/master c:
 ac971c948598b1ca6638ae7a89d3e237b90ad02b h: refs/heads/master i:   304525:
 0543cac9c35da784df9ad515fe19f52674ee839a   304523:
 9f9471f056e9baec0799be2d33ed16c6ba584c04   304519:
 4965f2464e9a9718f6de3b657af889b66b659845   304511:
 c4cdcae4ded15118a3126f5ed91c26693e139780 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/comedi/drivers/daqboard2000.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index febe291b690c..a189d923c787 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c5510ba5091f3d7be338875c84451b07a3dd498
+refs/heads/master: ac971c948598b1ca6638ae7a89d3e237b90ad02b
diff --git a/trunk/drivers/staging/comedi/drivers/daqboard2000.c b/trunk/drivers/staging/comedi/drivers/daqboard2000.c
index 952b08177b4a..480f418b28c1 100644
--- a/trunk/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/trunk/drivers/staging/comedi/drivers/daqboard2000.c
@@ -411,9 +411,12 @@ static int daqboard2000_ai_insn_read(struct comedi_device *dev,
 	    DAQBOARD2000_AcqResetScanListFifo |
 	    DAQBOARD2000_AcqResetResultsFifo | DAQBOARD2000_AcqResetConfigPipe;
 
-	/* If pacer clock is not set to some high value (> 10 us), we
-	   risk multiple samples to be put into the result FIFO. */
-	fpga->acqPacerClockDivLow = 1000000;	/* 1 second, should be long enough */
+	/*
+	 * If pacer clock is not set to some high value (> 10 us), we
+	 * risk multiple samples to be put into the result FIFO.
+	 */
+	/* 1 second, should be long enough */
+	fpga->acqPacerClockDivLow = 1000000;
 	fpga->acqPacerClockDivHigh = 0;
 
 	gain = CR_RANGE(insn->chanspec);