From 314dd180f9e9f20e95c4d79586ef45145192008b Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:11:17 -0400 Subject: [PATCH] --- yaml --- r: 141567 b: refs/heads/master c: cfee7b998b2407f5ee53d76bae9e2805baf6dbb4 h: refs/heads/master i: 141565: e832399cbcd6e354c009462634d863087b99a868 141563: ede696210de8c86730ff9446b436bbf74d6f8acb 141559: 7fb86eef81ca893febc8a68415e95f020eb53a14 141551: c45e37782b7c309fa287b030da3a040ddb5262b9 141535: 7970a4c849cf2403576292f2a37ea3c38a7019b4 141503: 8556f76fe6bfb871f7885e263d2aa25497e0421f 141439: c2d9fe7a422657297de249b078fbf66debba05de 141311: b9f0a2a9a55e27e85fa43af27ba7b2eba7599985 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/cb_pcimdas.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c42fde16df57..e7ab295a9fb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe7858af4f04d6ea5d18a513433846c63c70d0ec +refs/heads/master: cfee7b998b2407f5ee53d76bae9e2805baf6dbb4 diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c index dcd56f809944..3c78c42b7f41 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c +++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c @@ -83,7 +83,7 @@ See http://www.measurementcomputing.com/PDFManuals/pcim-das1602_16.pdf for more #define RESID_COUNT_L 14 /* Board description */ -typedef struct cb_pcimdas_board_struct { +struct cb_pcimdas_board { const char *name; unsigned short device_id; int ai_se_chans; // Inputs in single-ended mode @@ -98,9 +98,9 @@ typedef struct cb_pcimdas_board_struct { int dio_bits; // number of dio bits int has_dio; // has DIO const struct comedi_lrange *ranges; -} cb_pcimdas_board; +}; -static const cb_pcimdas_board cb_pcimdas_boards[] = { +static const struct cb_pcimdas_board cb_pcimdas_boards[] = { { name: "PCIM-DAS1602/16", device_id:0x56, @@ -134,7 +134,7 @@ MODULE_DEVICE_TABLE(pci, cb_pcimdas_pci_table); /* * Useful for shorthand access to the particular board structure */ -#define thisboard ((const cb_pcimdas_board *)dev->board_ptr) +#define thisboard ((const struct cb_pcimdas_board *)dev->board_ptr) /* this structure is for data unique to this hardware driver. If several hardware drivers keep similar information in this structure,