---

yaml --- r: 141547 b: refs/heads/master c: af105ad h: refs/heads/master i: 141545: dca7594 141543: eb4b777 v: v3
git-mirror · Apr 3, 2009 · b03110c · b03110c
1 parent 7f7feb5
commit b03110c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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,