From daef630f1cf972f2b8f3d299b1087072651cab70 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:06:58 -0400 Subject: [PATCH] --- yaml --- r: 141519 b: refs/heads/master c: c1b31c44a38e2b5153193680e4bee4856b3307e1 h: refs/heads/master i: 141517: f4395341f25a2bafb6496bb2f1039476016e8309 141515: f3f046e3c28625604f9de3b2703ae2e1ca18a33e 141511: 846e24387c1209cab7686188a337b28e8ae56a38 141503: 8556f76fe6bfb871f7885e263d2aa25497e0421f v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/adl_pci6208.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d588638150a3..03af7962ac90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4753d235e76b14c9f4585d569795a4ccb51485f8 +refs/heads/master: c1b31c44a38e2b5153193680e4bee4856b3307e1 diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci6208.c b/trunk/drivers/staging/comedi/drivers/adl_pci6208.c index fa290ba4690f..449cf87c477c 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci6208.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci6208.c @@ -57,13 +57,14 @@ Configuration Options: #define PCI6208_DRIVER_NAME "adl_pci6208" /* Board descriptions */ -typedef struct { +struct pci6208_board { const char *name; unsigned short dev_id; /* `lspci` will show you this */ int ao_chans; //int ao_bits; -} pci6208_board; -static const pci6208_board pci6208_boards[] = { +}; + +static const struct pci6208_board pci6208_boards[] = { /*{ name : "pci6208v", dev_id : 0x6208, //not sure @@ -96,7 +97,7 @@ static DEFINE_PCI_DEVICE_TABLE(pci6208_pci_table) = { MODULE_DEVICE_TABLE(pci, pci6208_pci_table); /* Will be initialized in pci6208_find device(). */ -#define thisboard ((const pci6208_board *)dev->board_ptr) +#define thisboard ((const struct pci6208_board *)dev->board_ptr) typedef struct { int data; @@ -110,7 +111,7 @@ static int pci6208_attach(struct comedi_device * dev, struct comedi_devconfig * static int pci6208_detach(struct comedi_device * dev); #define pci6208_board_nbr \ - (sizeof(pci6208_boards) / sizeof(pci6208_board)) + (sizeof(pci6208_boards) / sizeof(struct pci6208_board)) static struct comedi_driver driver_pci6208 = { driver_name:PCI6208_DRIVER_NAME,