From: Ian Abbott Date: Tue, 16 Dec 2008 13:09:56 +0000 (+0000) Subject: Staging: comedi: comedi_rt_task_context_t fix X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=44fdfaa91197dab07583f61c4e0542cb0e2b379c;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Staging: comedi: comedi_rt_task_context_t fix Fix redefinition of macro comedi_rt_task_context_t From: Ian Abbott Cc: Frank Mori Hess Cc: David Schleef Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/comedi_rt_timer.c b/drivers/staging/comedi/drivers/comedi_rt_timer.c index e0b76cc8bd06..878160eae080 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