diff --git a/[refs] b/[refs] index 00499f7ec5ba..37bc28489c2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c777b2ab2cffab9054e4bf777d6ccc35d18a0c58 +refs/heads/master: dcfbb64cc108435ae336f9b44014212a02f6bdf1 diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.c b/trunk/drivers/staging/comedi/drivers/rtd520.c index f3fea5ab87a0..df505a3d0ee6 100644 --- a/trunk/drivers/staging/comedi/drivers/rtd520.c +++ b/trunk/drivers/staging/comedi/drivers/rtd520.c @@ -406,10 +406,6 @@ struct rtdPrivate { /* Macros to access registers */ -/* Set About counter stop enable (write only) */ -#define RtdAboutStopEnable(dev, v) \ - writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_ACNT_STOP_ENABLE) - /* Set external trigger polarity (write only) 0=positive edge, 1=negative */ #define RtdTriggerPolarity(dev, v) \ writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_ETRG_POLARITY) @@ -1533,7 +1529,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->flags &= ~SEND_EOS; } writel(1, devpriv->las0 + LAS0_PACER_SELECT); - RtdAboutStopEnable(dev, 1); /* just interrupt, dont stop */ + writel(1, devpriv->las0 + LAS0_ACNT_STOP_ENABLE); /* BUG??? these look like enumerated values, but they are bit fields */