Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337407
b: refs/heads/master
c: f4c1a4f
h: refs/heads/master
i:
  337405: 7d2ec39
  337403: 5b08356
  337399: e42aa7b
  337391: df72fd6
  337375: 5e55c2f
  337343: e2136d2
  337279: 0bc01fe
  337151: b835733
  336895: eeb4229
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 30, 2012
1 parent 7fce99d commit 3a0a194
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9ef55e9f0eaa8512dee1edc360915c388a7ac4d9
refs/heads/master: f4c1a4f89b1740611fd3c1fa36d810a8629eff23
13 changes: 6 additions & 7 deletions trunk/drivers/staging/comedi/drivers/rtd520.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3a0a194

Please sign in to comment.