diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-22 12:33:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-23 10:36:28 -0700 |
| commit | 767308842b4b970ca105b1e80cd92af39355dfc5 (patch) | |
| tree | 15314fc5087e81a9330874cd04d1f849ddfd4f81 /drivers/staging/comedi/drivers/ni_labpc.h | |
| parent | fa3cb2191091657038ddb9207888b6cfb11fdf6e (diff) | |
staging: comedi: ni_labpc: move DMA init out of the common attach
Only the ISA versions of the LabPC boards support DMA. Move the DMA
initialization out of the labpc_common_attach() and put it in the
ISA specific labpc_attach() function.
Remove the 'dma_chan' parameter from labpc_common_attach().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_labpc.h')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.h b/drivers/staging/comedi/drivers/ni_labpc.h index e214bb9237b..7f8a8285163 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.h +++ b/drivers/staging/comedi/drivers/ni_labpc.h @@ -101,7 +101,7 @@ struct labpc_private { }; int labpc_common_attach(struct comedi_device *dev, - unsigned int irq, unsigned int dma); + unsigned int irq); void labpc_common_detach(struct comedi_device *dev); extern const int labpc_1200_ai_gain_bits[]; |