Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325196
b: refs/heads/master
c: 22d5ab0
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent 6b1ec63 commit baa8c1f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 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: 4ba47b8f88b6893e79e704d37bad7044c376fc4f
refs/heads/master: 22d5ab0201f2621ebe834f309cb94d712427e62c
4 changes: 0 additions & 4 deletions trunk/drivers/staging/comedi/drivers/icp_multi.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ There are 4 x 12-bit Analogue Outputs. Ranges : 5V, 10V, +/-5V, +/-10V

#define PCI_DEVICE_ID_ICP_MULTI 0x8000

#define IORANGE_ICP_MULTI 32

#define ICP_MULTI_ADC_CSR 0 /* R/W: ADC command/status register */
#define ICP_MULTI_AI 2 /* R: Analogue input data */
#define ICP_MULTI_DAC_CSR 4 /* R/W: DAC command/status register */
Expand Down Expand Up @@ -124,7 +122,6 @@ static unsigned short pci_list_builded; /*>0 list of card is known */
struct boardtype {
const char *name; /* driver name */
int device_id;
int iorange; /* I/O range len */
char have_irq; /* 1=card support IRQ */
};

Expand Down Expand Up @@ -871,7 +868,6 @@ static const struct boardtype boardtypes[] = {
{
.name = "icp_multi",
.device_id = PCI_DEVICE_ID_ICP_MULTI,
.iorange = IORANGE_ICP_MULTI,
.have_irq = 1,
},
};
Expand Down

0 comments on commit baa8c1f

Please sign in to comment.