staging: comedi: addi_apci_3120: move APCI3120_FIFO_ADVANCE_ON_BYTE_2

Move this define to the main driver source and convert it to a bit-shift.

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>

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 0e31537b1848bc059de2d51a0672098e6358bfc4..474b600400f3a5e7ecda0c50eb82c62baaa1234c 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -40,12 +40,6 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
   +----------+-----------+------------------------------------------------+
 */
 
-/*
- * ADDON RELATED ADDITIONS
- */
-/* Constant */
-#define APCI3120_FIFO_ADVANCE_ON_BYTE_2                        0x20000000L
-
 #define APCI3120_START                 1
 #define APCI3120_STOP                  0
 

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 699ba76c58aeebb735b6e91d4d327ef3a3048f01..7ad7621e74e066794844cf98477bb44d5ddb0813 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -11,6 +11,7 @@
  * PCI BAR 0 register map (devpriv->amcc)
  * see amcc_s5933.h for register and bit defines
  */
+#define APCI3120_FIFO_ADVANCE_ON_BYTE_2                (1 << 29)
 
 /*
  * PCI BAR 1 register map (dev->iobase)