From: Ian Abbott <abbotti@mev.co.uk>
Date: Tue, 16 Dec 2008 13:09:56 +0000 (+0000)
Subject: Staging: comedi: comedi_rt_task_context_t fix
X-Git-Tag: v2.6.30-rc1~202^2~320
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=44fdfaa91197dab07583f61c4e0542cb0e2b379c;p=net-next-2.6.git

Staging: comedi: comedi_rt_task_context_t fix

Fix redefinition of macro comedi_rt_task_context_t

From: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: David Schleef <ds@schleef.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/comedi/drivers/comedi_rt_timer.c b/drivers/staging/comedi/drivers/comedi_rt_timer.c
index e0b76cc8bd0..878160eae08 100644
--- a/drivers/staging/comedi/drivers/comedi_rt_timer.c
+++ b/drivers/staging/comedi/drivers/comedi_rt_timer.c
@@ -104,8 +104,6 @@ static inline RTIME nano2count(long long ns)
 #define start_rt_timer(x)
 #define stop_rt_timer()
 
-#define comedi_rt_task_context_t	int
-
 #endif
 #ifdef CONFIG_COMEDI_RTAI
 #include <rtai.h>