From e49ccdc50c9592fa603da1ea4b03a8eb554cac12 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:10:28 -0400 Subject: [PATCH] --- yaml --- r: 141558 b: refs/heads/master c: 3281a63d0b1eecbb21848c3e123c2fc0cd1d4a80 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/cb_das16_cs.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5e13127b719e..76e300e192fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3e8fa97c454246be2bc6f4ddf20951c5b74bc22 +refs/heads/master: 3281a63d0b1eecbb21848c3e123c2fc0cd1d4a80 diff --git a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c index 487ae3bd21d5..12f0085b1894 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -54,12 +54,12 @@ Status: experimental #define DAS16CS_CTR_CONTROL 14 #define DAS16CS_DIO 16 -typedef struct das16cs_board_struct { +struct das16cs_board { const char *name; int device_id; int n_ao_chans; -} das16cs_board; -static const das16cs_board das16cs_boards[] = { +}; +static const struct das16cs_board das16cs_boards[] = { { device_id:0x0000,/* unknown */ name: "PC-CARD DAS16/16", @@ -78,7 +78,7 @@ static const das16cs_board das16cs_boards[] = { }; #define n_boards (sizeof(das16cs_boards)/sizeof(das16cs_boards[0])) -#define thisboard ((const das16cs_board *)dev->board_ptr) +#define thisboard ((const struct das16cs_board *)dev->board_ptr) typedef struct { struct pcmcia_device *link; @@ -146,7 +146,7 @@ static int get_prodid(struct comedi_device * dev, struct pcmcia_device *link) return prodid; } -static const das16cs_board *das16cs_probe(struct comedi_device * dev, +static const struct das16cs_board *das16cs_probe(struct comedi_device * dev, struct pcmcia_device *link) { int id;