From 414aaed9f9d0f58a267c48c101faab5eb3e7ea1b Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 16 Mar 2009 22:18:05 -0400
Subject: [PATCH] --- yaml --- r: 141631 b: refs/heads/master c:
 b81c8035ff531ae47b45f132cc0305d8c5c412c6 h: refs/heads/master i:   141629:
 024dfb65c210fc95570d918efb58151b47ac977f   141627:
 609d09cc224c8bd01c9aaec62cb4b3bdf5d27491   141623:
 1996bd6f165432477005147a1cfc4a3789f1b2ac   141615:
 03ca706cbe562cc2e0d6e65e52b31963bf38618f   141599:
 4c0925b4284b41128ed0ba75369c9b07f60b22b8   141567:
 314dd180f9e9f20e95c4d79586ef45145192008b v: v3

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

diff --git a/[refs] b/[refs]
index c1b834414f1d..193ae23f1bc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60efa611c788c4f5b9fdc206aeb9e7c91e0c3ffb
+refs/heads/master: b81c8035ff531ae47b45f132cc0305d8c5c412c6
diff --git a/trunk/drivers/staging/comedi/drivers/dt3000.c b/trunk/drivers/staging/comedi/drivers/dt3000.c
index fc4389f25eb0..d9467984706e 100644
--- a/trunk/drivers/staging/comedi/drivers/dt3000.c
+++ b/trunk/drivers/staging/comedi/drivers/dt3000.c
@@ -262,7 +262,8 @@ MODULE_DEVICE_TABLE(pci, dt3k_pci_table);
 #define DT3000_CHANNEL_MODE_SE		0
 #define DT3000_CHANNEL_MODE_DI		1
 
-typedef struct {
+struct dt3k_private {
+
 	struct pci_dev *pci_dev;
 	resource_size_t phys_addr;
 	void *io_addr;
@@ -270,8 +271,9 @@ typedef struct {
 	unsigned int ao_readback[2];
 	unsigned int ai_front;
 	unsigned int ai_rear;
-} dt3k_private;
-#define devpriv ((dt3k_private *)dev->private)
+};
+
+#define devpriv ((struct dt3k_private *)dev->private)
 
 static int dt3000_attach(struct comedi_device * dev, struct comedi_devconfig * it);
 static int dt3000_detach(struct comedi_device * dev);
@@ -809,7 +811,7 @@ static int dt3000_attach(struct comedi_device * dev, struct comedi_devconfig * i
 	bus = it->options[0];
 	slot = it->options[1];
 
-	if ((ret = alloc_private(dev, sizeof(dt3k_private))) < 0)
+	if ((ret = alloc_private(dev, sizeof(struct dt3k_private))) < 0)
 		return ret;
 
 	ret = dt_pci_probe(dev, bus, slot);