From 4efb1754d3bc516069d2547312a23709a11be640 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:12:05 -0400 Subject: [PATCH] --- yaml --- r: 141575 b: refs/heads/master c: 9da18ff8c352c8827abee8ebd8570d8bf2767ebb h: refs/heads/master i: 141573: 408eb85730ed9f1793bfc24c640bfe0bfb142eda 141571: abc6821a3b33ae289aa7571c31306595a07244a5 141567: 314dd180f9e9f20e95c4d79586ef45145192008b v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/daqboard2000.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f0a7a2684726..dd9c33edbc06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79c7b392b32fc3154911fe3d8c65274cda5d5728 +refs/heads/master: 9da18ff8c352c8827abee8ebd8570d8bf2767ebb diff --git a/trunk/drivers/staging/comedi/drivers/daqboard2000.c b/trunk/drivers/staging/comedi/drivers/daqboard2000.c index b02bf5c8d079..ae1f6145c565 100644 --- a/trunk/drivers/staging/comedi/drivers/daqboard2000.c +++ b/trunk/drivers/staging/comedi/drivers/daqboard2000.c @@ -306,17 +306,17 @@ static struct comedi_driver driver_daqboard2000 = { detach:daqboard2000_detach, }; -typedef struct { +struct daq200_boardtype { const char *name; int id; -} boardtype; -static const boardtype boardtypes[] = { +}; +static const struct daq200_boardtype boardtypes[] = { {"ids2", DAQBOARD2000_SUBSYSTEM_IDS2}, {"ids4", DAQBOARD2000_SUBSYSTEM_IDS4}, }; -#define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype)) -#define this_board ((const boardtype *)dev->board_ptr) +#define n_boardtypes (sizeof(boardtypes)/sizeof(struct daq200_boardtype)) +#define this_board ((const struct daq200_boardtype *)dev->board_ptr) static DEFINE_PCI_DEVICE_TABLE(daqboard2000_pci_table) = { {0x1616, 0x0409, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},