From 3a0a194d55d2aa0f35dc9871d38771cf89062ff7 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 29 Oct 2012 10:08:48 -0700 Subject: [PATCH] --- yaml --- r: 337407 b: refs/heads/master c: f4c1a4f89b1740611fd3c1fa36d810a8629eff23 h: refs/heads/master i: 337405: 7d2ec3964f49ab14106a90d0efdf88025e8c9d02 337403: 5b0835620a9eb492b5a2d0b52bfd7e1c7e9c68fc 337399: e42aa7b0d8a45e027714a016b23e2cae7f1908eb 337391: df72fd6dd7154cc7dcb63d0f56a83fa5a656b479 337375: 5e55c2fb11bd40710aab8076f99e28532d3e5d02 337343: e2136d2d3425cb3597651f5794eeb81c38a20e7c 337279: 0bc01feace0e9986c848f6c65f209abd8dc26c23 337151: b8357338dca65c4b7041115e062f499660e4ed35 336895: eeb42294b50386d43edb4baffd22b58a565b28cc v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/rtd520.h | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 7380379cbe3d..722a37be7f90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ef55e9f0eaa8512dee1edc360915c388a7ac4d9 +refs/heads/master: f4c1a4f89b1740611fd3c1fa36d810a8629eff23 diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.h b/trunk/drivers/staging/comedi/drivers/rtd520.h index 7d0b47d6b4a6..887cd468dc98 100644 --- a/trunk/drivers/staging/comedi/drivers/rtd520.h +++ b/trunk/drivers/staging/comedi/drivers/rtd520.h @@ -106,13 +106,12 @@ #define LAS0_DMA1_RESET 0x01d0 /* DMA1 Request state machine reset */ /* - LAS1 - Name Local Address Function -*/ -#define LAS1_ADC_FIFO 0x0000 /* Read A/D FIFO (16bit) - */ -#define LAS1_HDIO_FIFO 0x0004 /* Read High Speed Digital Input FIFO (16bit) - */ -#define LAS1_DAC1_FIFO 0x0008 /* - Write D/A1 FIFO (16bit) */ -#define LAS1_DAC2_FIFO 0x000C /* - Write D/A2 FIFO (16bit) */ + * Local Address Space 1 Offsets + */ +#define LAS1_ADC_FIFO 0x0000 /* A/D FIFO (16bit) */ +#define LAS1_HDIO_FIFO 0x0004 /* HiSpd DI FIFO (16bit) */ +#define LAS1_DAC1_FIFO 0x0008 /* D/A1 FIFO (16bit) */ +#define LAS1_DAC2_FIFO 0x000c /* D/A2 FIFO (16bit) */ /* LCFG: PLX 9080 local config & runtime registers