Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141624
b: refs/heads/master
c: a7195f3
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 1996bd6 commit 4996ed3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions 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: c7ef22985517e35d3b5cf5cffa962a4b8ed8899b
refs/heads/master: a7195f3d92f5fc560e597598a56d9c394b65ee81
10 changes: 6 additions & 4 deletions trunk/drivers/staging/comedi/drivers/ni_pcidio.c
Original file line number Diff line number Diff line change
Expand Up @@ -298,14 +298,16 @@ static struct comedi_driver driver_pcidio = {
detach:nidio_detach,
};

typedef struct {
struct nidio_board {

int dev_id;
const char *name;
int n_8255;
unsigned int is_diodaq:1;
unsigned int uses_firmware:1;
} nidio_board;
static const nidio_board nidio_boards[] = {
};

static const struct nidio_board nidio_boards[] = {
{
dev_id: 0x1150,
name: "pci-dio-32hs",
Expand Down Expand Up @@ -370,7 +372,7 @@ static const nidio_board nidio_boards[] = {
};

#define n_nidio_boards (sizeof(nidio_boards)/sizeof(nidio_boards[0]))
#define this_board ((const nidio_board *)dev->board_ptr)
#define this_board ((const struct nidio_board *)dev->board_ptr)

static DEFINE_PCI_DEVICE_TABLE(ni_pcidio_pci_table) = {
{PCI_VENDOR_ID_NATINST, 0x1150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
Expand Down

0 comments on commit 4996ed3

Please sign in to comment.