Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337404
b: refs/heads/master
c: fe559c0
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 30, 2012
1 parent 5b08356 commit 78b01b4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 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: 37f97e500db829ad6216776a7f59a3173670477b
refs/heads/master: fe559c022444b8335a6417eb31731b5124faf245
5 changes: 2 additions & 3 deletions trunk/drivers/staging/comedi/drivers/rtd520.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ Configuration options:
#include "../comedidev.h"

#include "comedi_fc.h"
#include "rtd520.h"
#include "plx9080.h"

/*======================================================================
Driver specific stuff (tunable)
Expand Down Expand Up @@ -155,9 +157,6 @@ Configuration options:
/* min speed when only 1 channel (no burst counter) */
#define RTD_MIN_SPEED_1 5000000 /* 200Hz, in nanoseconds */

#include "rtd520.h"
#include "plx9080.h"

/* Setup continuous ring of 1/2 FIFO transfers. See RTD manual p91 */
#define DMA_MODE_BITS (\
PLX_LOCAL_BUS_16_WIDE_BITS \
Expand Down

0 comments on commit 78b01b4

Please sign in to comment.