Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186658
b: refs/heads/master
c: d5a2ffd
h: refs/heads/master
v: v3
  • Loading branch information
Uwe Kleine-König authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent c17498a commit 68b64ea
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 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: 9d220c6b54f3d0b141846321814ec1c4e4fbdc67
refs/heads/master: d5a2ffd8e8d602293339f69180aff8914c454d83
6 changes: 3 additions & 3 deletions trunk/drivers/staging/comedi/drivers/adl_pci9118.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ Configuration options:
#define IORANGE_9118 64 /* I hope */
#define PCI9118_CHANLEN 255 /* len of chanlist, some source say 256, but reality looks like 255 :-( */

#define PCI9118_CNT0 0x00 /* R/W: 8254 couter 0 */
#define PCI9118_CNT1 0x04 /* R/W: 8254 couter 0 */
#define PCI9118_CNT2 0x08 /* R/W: 8254 couter 0 */
#define PCI9118_CNT0 0x00 /* R/W: 8254 counter 0 */
#define PCI9118_CNT1 0x04 /* R/W: 8254 counter 0 */
#define PCI9118_CNT2 0x08 /* R/W: 8254 counter 0 */
#define PCI9118_CNTCTRL 0x0c /* W: 8254 counter control */
#define PCI9118_AD_DATA 0x10 /* R: A/D data */
#define PCI9118_DA1 0x10 /* W: D/A registers */
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/comedi/drivers/adv_pci1710.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ Configuration options:
#define PCI171x_DAREF 14 /* W: D/A reference control */
#define PCI171x_DI 16 /* R: digi inputs */
#define PCI171x_DO 16 /* R: digi inputs */
#define PCI171x_CNT0 24 /* R/W: 8254 couter 0 */
#define PCI171x_CNT1 26 /* R/W: 8254 couter 1 */
#define PCI171x_CNT2 28 /* R/W: 8254 couter 2 */
#define PCI171x_CNT0 24 /* R/W: 8254 counter 0 */
#define PCI171x_CNT1 26 /* R/W: 8254 counter 1 */
#define PCI171x_CNT2 28 /* R/W: 8254 counter 2 */
#define PCI171x_CNTCTRL 30 /* W: 8254 counter control */

/* upper bits from status register (PCI171x_STATUS) (lower is same woth control reg) */
Expand Down

0 comments on commit 68b64ea

Please sign in to comment.