Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259551
b: refs/heads/master
c: f80d1d2
h: refs/heads/master
i:
  259549: febfc37
  259547: 1d513f5
  259543: 814765f
  259535: 186bd6b
  259519: c2c38a8
v: v3
  • Loading branch information
Ralf Thielow authored and Greg Kroah-Hartman committed Jun 28, 2011
1 parent 87b953f commit 579dfa9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 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: 2265e2e7fd23ad9cd1408866658aa747c4c1e9f5
refs/heads/master: f80d1d22b6c30771f8d4576d5c741c33b0cfd8ab
6 changes: 5 additions & 1 deletion trunk/drivers/staging/comedi/comedi.h
Original file line number Diff line number Diff line change
Expand Up @@ -514,12 +514,16 @@
return 0x1 + pfi_channel;
else
return 0xb + pfi_channel;
} static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel) {
}

static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel)
{
if (rtsi_channel < 7)
return 0xb + rtsi_channel;
else
return 0x1b;
}

/* mode bits for NI general-purpose counters, set with
* INSN_CONFIG_SET_COUNTER_MODE */
#define NI_GPCT_COUNTING_MODE_SHIFT 16
Expand Down

0 comments on commit 579dfa9

Please sign in to comment.