From eca61ee3113306adf80c732ffbcea19c7a7ab9d6 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Thu, 19 Mar 2009 17:58:46 -0400
Subject: [PATCH] --- yaml --- r: 141683 b: refs/heads/master c:
 47c30a2cc336d493d624d8437f41c19a270bb672 h: refs/heads/master i:   141681:
 b3afd5cddf64b7895649b6f17c99dab2c73b4741   141679:
 7de26ac919daaa8e125a85efbe42d80d90ee012e v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/comedi/drivers/ni_65xx.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f8c897ae7bd7..f70d97e275f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4c6b31958afecc08c8e83f3bc25161ce4442542
+refs/heads/master: 47c30a2cc336d493d624d8437f41c19a270bb672
diff --git a/trunk/drivers/staging/comedi/drivers/ni_65xx.c b/trunk/drivers/staging/comedi/drivers/ni_65xx.c
index c5fac96f25dd..4f6e77879338 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_65xx.c
@@ -282,14 +282,15 @@ static DEFINE_PCI_DEVICE_TABLE(ni_65xx_pci_table) = {
 
 MODULE_DEVICE_TABLE(pci, ni_65xx_pci_table);
 
-typedef struct {
+struct ni_65xx_private {
 	struct mite_struct *mite;
 	unsigned int filter_interval;
 	unsigned short filter_enable[NI_65XX_MAX_NUM_PORTS];
 	unsigned short output_bits[NI_65XX_MAX_NUM_PORTS];
 	unsigned short dio_direction[NI_65XX_MAX_NUM_PORTS];
-} ni_65xx_private;
-static inline ni_65xx_private *private(struct comedi_device * dev)
+};
+
+static inline struct ni_65xx_private *private(struct comedi_device * dev)
 {
 	return dev->private;
 }
@@ -625,7 +626,7 @@ static int ni_65xx_attach(struct comedi_device * dev, struct comedi_devconfig *
 
 	printk("comedi%d: ni_65xx:", dev->minor);
 
-	if ((ret = alloc_private(dev, sizeof(ni_65xx_private))) < 0)
+	if ((ret = alloc_private(dev, sizeof(struct ni_65xx_private))) < 0)
 		return ret;
 
 	ret = ni_65xx_find_device(dev, it->options[0], it->options[1]);