From: H Hartley Sweeten Date: Tue, 4 Nov 2014 17:55:04 +0000 (-0700) Subject: staging: comedi: addi_apci_3120: move APCI3120_FIFO_ADVANCE_ON_BYTE_2 X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b7d62cf8123234e2f9eb644fd0be52b48a28075a;p=deliverable%2Flinux.git 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index 0e31537b1848..474b600400f3 100644 --- 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 699ba76c58ae..7ad7621e74e0 100644 --- 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)