[PATCH 068/342] Staging: comedi: Undo stupid commit made 3 months ago
Greg Kroah-Hartman
gregkh at suse.de
Fri Jun 19 18:04:52 UTC 2009
From: Ian Abbott <abbotti at mev.co.uk>
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 at mev.co.uk>
Signed-off-by: Frank Mori Hess <fmhess at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/staging/comedi/drivers/comedi_rt_timer.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
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>
--
1.6.3.2
More information about the devel
mailing list