From eaba5043e050834c9862e976415924f22a5ae68c Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Thu, 19 Mar 2009 18:00:26 -0400
Subject: [PATCH] --- yaml --- r: 141702 b: refs/heads/master c:
 8b95a0e17f416e1db80c26ecd8f3e894ad271d0b h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/comedi/drivers/me4000.c | 2 +-
 trunk/drivers/staging/comedi/drivers/me4000.h | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 583b5b95d1e2..ca217fb8b838 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21921108bef40b75495301f5dd3d992ed66a7ba8
+refs/heads/master: 8b95a0e17f416e1db80c26ecd8f3e894ad271d0b
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c
index 31f35e0eceb1..8a2e109cde70 100644
--- a/trunk/drivers/staging/comedi/drivers/me4000.c
+++ b/trunk/drivers/staging/comedi/drivers/me4000.c
@@ -1745,7 +1745,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id PT_REGS_ARG)
 	unsigned int tmp;
 	struct comedi_device *dev = dev_id;
 	struct comedi_subdevice *s = dev->subdevices;
-	me4000_ai_context_t *ai_context = &info->ai_context;
+	struct me4000_ai_context *ai_context = &info->ai_context;
 	int i;
 	int c = 0;
 	long lval;
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.h b/trunk/drivers/staging/comedi/drivers/me4000.h
index db38c9915d39..6e6dc0e8f25e 100644
--- a/trunk/drivers/staging/comedi/drivers/me4000.h
+++ b/trunk/drivers/staging/comedi/drivers/me4000.h
@@ -342,7 +342,7 @@ struct me4000_ao_context {
 	unsigned long preload_reg;
 };
 
-typedef struct me4000_ai_context {
+struct me4000_ai_context {
 	int irq;
 
 	unsigned long ctrl_reg;
@@ -358,7 +358,7 @@ typedef struct me4000_ai_context {
 	unsigned long start_reg;
 	unsigned long irq_status_reg;
 	unsigned long sample_counter_reg;
-} me4000_ai_context_t;
+};
 
 typedef struct me4000_dio_context {
 	unsigned long dir_reg;