From b03110c0444a088340ad5ed225970b7174416e82 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:09:29 -0400 Subject: [PATCH] --- yaml --- r: 141547 b: refs/heads/master c: af105ad3f57421a36dd60c8f54edcebc7a09256b h: refs/heads/master i: 141545: dca75947f984446a3ad389bde604f3ed8d6fbe77 141543: eb4b777a1e6aa99c3fdb4d09c6f4a4c92dc33edb v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/amplc_dio200.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a70b76dc4e02..a030f669dda1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d7a42ef60e93352b49c5da7cba00f20ce255afc +refs/heads/master: af105ad3f57421a36dd60c8f54edcebc7a09256b diff --git a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c index 2a46e7eb59f6..7ad70ae47404 100644 --- a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c +++ b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c @@ -355,15 +355,15 @@ enum dio200_sdtype { sd_none, sd_intr, sd_8255, sd_8254 }; #define DIO200_MAX_SUBDEVS 7 #define DIO200_MAX_ISNS 6 -typedef struct dio200_layout_struct { +struct dio200_layout_struct { unsigned short n_subdevs; /* number of subdevices */ unsigned char sdtype[DIO200_MAX_SUBDEVS]; /* enum dio200_sdtype */ unsigned char sdinfo[DIO200_MAX_SUBDEVS]; /* depends on sdtype */ char has_int_sce; /* has interrupt enable/status register */ char has_clk_gat_sce; /* has clock/gate selection registers */ -} dio200_layout; +}; -static const dio200_layout dio200_layouts[] = { +static const struct dio200_layout_struct dio200_layouts[] = { [pc212_layout] = { n_subdevs:6, sdtype: {sd_8255, sd_8254, sd_8254, sd_8254, @@ -1271,7 +1271,7 @@ static int dio200_attach(struct comedi_device * dev, struct comedi_devconfig * i struct pci_dev *pci_dev = NULL; int bus = 0, slot = 0; #endif - const dio200_layout *layout; + const struct dio200_layout_struct *layout; int share_irq = 0; int sdx; unsigned n; @@ -1431,7 +1431,7 @@ static int dio200_attach(struct comedi_device * dev, struct comedi_devconfig * i */ static int dio200_detach(struct comedi_device * dev) { - const dio200_layout *layout; + const struct dio200_layout_struct *layout; unsigned n; printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor,