staging: comedi: ni_labpc: move declaration of local var 'dma_flags'

In labpc_common_attach(), move the declaration of the local variable
'dma_flags' to remove the need for the extra #ifdef/#endif.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index 33e9f4dee6d3cb536efd22caf90de1c74918803d..2c932e6d97ccbe9e0e3fca1e572e4ac6b03c0214 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -1668,12 +1668,9 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
        const struct labpc_boardinfo *board = comedi_board(dev);
        struct labpc_private *devpriv = dev->private;
        struct comedi_subdevice *s;
-       int i;
        unsigned long isr_flags;
-#ifdef CONFIG_ISA_DMA_API
-       unsigned long dma_flags;
-#endif
        int ret;
+       int i;
 
        dev_info(dev->class_dev, "ni_labpc: %s\n", board->name);
        if (iobase == 0) {
@@ -1728,6 +1725,8 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
                dev_err(dev->class_dev, "invalid dma channel %u\n", dma_chan);
                return -EINVAL;
        } else if (dma_chan) {
+               unsigned long dma_flags;
+
                /* allocate dma buffer */
                devpriv->dma_buffer = kmalloc(dma_buffer_size,
                                              GFP_KERNEL | GFP_DMA);