Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249725
b: refs/heads/master
c: cfe3cff
h: refs/heads/master
i:
  249723: a049edc
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed May 17, 2011
1 parent bcef258 commit 7097f1a
Show file tree
Hide file tree
Showing 2 changed files with 3 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: c5cbebf87f49dfb4f4ccdf86f6c24b4912a3061f
refs/heads/master: cfe3cffd8e44c0b69c9c50a1659acbd32ac19b70
3 changes: 2 additions & 1 deletion trunk/drivers/staging/comedi/drivers/adv_pci_dio.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ enum hw_io_access {

/* Advantech PCI-1751/3/3E */
#define PCI1751_DIO 0 /* R/W: begin of 8255 registers block */
#define PCI1751_CNT 24 /* R/W: begin of 8254 registers block */
#define PCI1751_ICR 32 /* W: Interrupt control register */
#define PCI1751_ISR 32 /* R: Interrupt status register */
#define PCI1753_DIO 0 /* R/W: begin of 8255 registers block */
Expand Down Expand Up @@ -329,7 +330,7 @@ static const struct dio_boardtype boardtypes[] = {
{ {0, 0, 0, 0}, {0, 0, 0, 0} },
{ {48, PCI1751_DIO, 2, 0}, {0, 0, 0, 0} },
{0, 0, 0, 0},
{ {0, 0, 0, 0} },
{ {3, PCI1751_CNT, 1, 0} },
IO_8b},
{"pci1752", PCI_VENDOR_ID_ADVANTECH, 0x1752, PCIDIO_MAINREG,
TYPE_PCI1752,
Expand Down

0 comments on commit 7097f1a

Please sign in to comment.