From: Ian Abbott <abbotti@mev.co.uk>
Date: Tue, 14 Apr 2009 15:04:24 +0000 (-0400)
Subject: Staging: comedi: Undo stupid commit made 3 months ago
X-Git-Tag: v2.6.31-rc1~105^2~274
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4bde29ed2220c3089e93258e476e3a7f4fc388a1;p=platform%2Fkernel%2Flinux-exynos.git

Staging: comedi: Undo stupid commit made 3 months ago

Undo stupid commit made 3 months ago :
 "Fix redefinition of macro comedi_rt_task_context_t".
 It wasn't being redefined, it was being defined for RTLinux.

From: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
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 5d79c54..c19ca8d 100644
--- a/drivers/staging/comedi/drivers/comedi_rt_timer.c
+++ b/drivers/staging/comedi/drivers/comedi_rt_timer.c
@@ -104,6 +104,8 @@ 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>