From f50365949f95afb2c61af817865a4b170dc11c70 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Thu, 19 Mar 2009 17:59:44 -0400
Subject: [PATCH] --- yaml --- r: 141694 b: refs/heads/master c:
 2e93aa5b5b8050090a22e162f9af6b18ca3ec47a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 13a0deb27737..0681bea71607 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30570f0dee2b0e3ede09e08eb5dfd514317a7587
+refs/heads/master: 2e93aa5b5b8050090a22e162f9af6b18ca3ec47a
diff --git a/trunk/drivers/staging/comedi/drivers/ni_pcidio.c b/trunk/drivers/staging/comedi/drivers/ni_pcidio.c
index 639c1676a805..87def2cc9a29 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -390,7 +390,7 @@ static DEFINE_PCI_DEVICE_TABLE(ni_pcidio_pci_table) = {
 
 MODULE_DEVICE_TABLE(pci, ni_pcidio_pci_table);
 
-typedef struct {
+struct nidio96_private {
 	struct mite_struct *mite;
 	int boardtype;
 	int dio;
@@ -398,8 +398,8 @@ typedef struct {
 	struct mite_channel *di_mite_chan;
 	struct mite_dma_descriptor_ring *di_mite_ring;
 	spinlock_t mite_channel_lock;
-} nidio96_private;
-#define devpriv ((nidio96_private *)dev->private)
+};
+#define devpriv ((struct nidio96_private *)dev->private)
 
 static int ni_pcidio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
 	struct comedi_cmd * cmd);
@@ -1161,7 +1161,7 @@ static int nidio_attach(struct comedi_device * dev, struct comedi_devconfig * it
 
 	printk("comedi%d: nidio:", dev->minor);
 
-	if ((ret = alloc_private(dev, sizeof(nidio96_private))) < 0)
+	if ((ret = alloc_private(dev, sizeof(struct nidio96_private))) < 0)
 		return ret;
 	spin_lock_init(&devpriv->mite_channel_lock);