diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2008-12-16 13:09:56 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:52 -0700 |
| commit | 44fdfaa91197dab07583f61c4e0542cb0e2b379c (patch) | |
| tree | 97e7de24bd88dd7cde9b2016ffae43b713a32e5a | |
| parent | 53b670a75bef4bf6484bbf6ca6a896c365676fd4 (diff) | |
| download | op-kernel-dev-44fdfaa91197dab07583f61c4e0542cb0e2b379c.zip op-kernel-dev-44fdfaa91197dab07583f61c4e0542cb0e2b379c.tar.gz | |
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/comedi_rt_timer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_rt_timer.c b/drivers/staging/comedi/drivers/comedi_rt_timer.c index e0b76cc..878160e 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> |
