From 3f836f3fb01cfaed5ecd4e63442efca1dad26743 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 16 Mar 2009 22:18:16 -0400
Subject: [PATCH] --- yaml --- r: 141633 b: refs/heads/master c:
 83101a1770982817ecbcb7679439352795bc7a47 h: refs/heads/master i:   141631:
 414aaed9f9d0f58a267c48c101faab5eb3e7ea1b v: v3

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

diff --git a/[refs] b/[refs]
index c5e2b32e1630..f156c0750e50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 352dec620aea9529180034fa461d290026ff57e9
+refs/heads/master: 83101a1770982817ecbcb7679439352795bc7a47
diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
index 680cc738cc5c..a147772c83fe 100644
--- a/trunk/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
@@ -137,10 +137,12 @@ struct jr3_pci_dev_private {
 };
 
 
-typedef struct {
+struct poll_delay_t {
+
 	int min;
 	int max;
-} poll_delay_t;
+};
+
 
 typedef struct {
 	volatile struct jr3_channel *channel;
@@ -166,9 +168,9 @@ typedef struct {
 	int retries;
 } jr3_pci_subdev_private;
 
-static poll_delay_t poll_delay_min_max(int min, int max)
+static struct poll_delay_t poll_delay_min_max(int min, int max)
 {
-	poll_delay_t result;
+	struct poll_delay_t result;
 
 	result.min = min;
 	result.max = max;
@@ -525,9 +527,9 @@ static int jr3_download_firmware(struct comedi_device * dev, const u8 * data,
 	return result;
 }
 
-static poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice * s)
+static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice * s)
 {
-	poll_delay_t result = poll_delay_min_max(1000, 2000);
+	struct poll_delay_t result = poll_delay_min_max(1000, 2000);
 	jr3_pci_subdev_private *p = s->private;
 
 	if (p) {
@@ -752,7 +754,7 @@ static void jr3_pci_poll_dev(unsigned long data)
 	for (i = 0; i < devpriv->n_channels; i++) {
 		jr3_pci_subdev_private *subdevpriv = dev->subdevices[i].private;
 		if (now > subdevpriv->next_time_min) {
-			poll_delay_t sub_delay;
+			struct poll_delay_t sub_delay;
 
 			sub_delay = jr3_pci_poll_subdevice(&dev->subdevices[i]);
 			subdevpriv->next_time_min =