From 2188de577898a940d17b7bf3b0b9e079802591b1 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 24 Sep 2012 13:38:53 -0700
Subject: [PATCH] --- yaml --- r: 325543 b: refs/heads/master c:
 98667bf7cc930c56f9257a8296d27a78eebac43f h: refs/heads/master i:   325541:
 a0dae3fa4d731d28264ecbbba119754f0de66243   325539:
 e5acb777ecc11a3b15b4053482fea1d9724e1588   325535:
 ceb9aa301b68bf805d7a2a5fbcc2bfa929f2cd1b v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/comedi/drivers/s626.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 65ab75086193..b5bd28a09afc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc598176bbd7dfbcfcd6177d14b10768c59effae
+refs/heads/master: 98667bf7cc930c56f9257a8296d27a78eebac43f
diff --git a/trunk/drivers/staging/comedi/drivers/s626.c b/trunk/drivers/staging/comedi/drivers/s626.c
index 0b897375eda6..6f1705ba60e2 100644
--- a/trunk/drivers/staging/comedi/drivers/s626.c
+++ b/trunk/drivers/staging/comedi/drivers/s626.c
@@ -2665,12 +2665,6 @@ static void s626_initialize(struct comedi_device *dev)
 	for (chan = 0; chan < S626_DAC_CHANNELS; chan++)
 		SetDAC(dev, chan, 0);
 
-	/* Init Counter Interrupt enab mask for RDMISC2.  This mask is
-	 * applied against MISC2 when testing to determine which timer
-	 * events are requesting interrupt service.
-	 */
-	devpriv->CounterIntEnabs = 0;
-
 	/*  Init counters. */
 	CountersInit(dev);