From: Ian Abbott Date: Tue, 14 Apr 2009 15:01:50 +0000 (-0400) Subject: Staging: comedi: Work around malformed RTAI_VERSION_CODE. X-Git-Tag: MMI-PSA29.97-13-9~27688^2~275 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5b32f4397a93a2819a71438a7ba11650529827e8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Staging: comedi: Work around malformed RTAI_VERSION_CODE. Signed-off-by: Frank Mori Hess 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 8dbd0fde1f86..5d79c545ad75 100644 --- a/drivers/staging/comedi/drivers/comedi_rt_timer.c +++ b/drivers/staging/comedi/drivers/comedi_rt_timer.c @@ -108,6 +108,21 @@ static inline RTIME nano2count(long long ns) #ifdef CONFIG_COMEDI_RTAI #include #include +#include + +/* RTAI_VERSION_CODE doesn't work for rtai-3.6-cv and other strange versions. + * These are characterized by CONFIG_RTAI_REVISION_LEVEL being defined as an + * empty macro and CONFIG_RTAI_VERSION_MINOR being defined as something like + * '6-cv' or '7-test1'. The problem has been noted by the RTAI folks and they + * promise not to do it again. :-) Try and work around it here. */ +#if !(CONFIG_RTAI_REVISION_LEVEL + 0) +#undef CONFIG_RTAI_REVISION_LEVEL +#define CONFIG_RTAI_REVISION_LEVEL 0 +#define cv 0 +#define test1 0 +#define test2 0 +#define test3 0 +#endif #if RTAI_VERSION_CODE < RTAI_MANGLE_VERSION(3,3,0) #define comedi_rt_task_context_t int @@ -115,6 +130,12 @@ static inline RTIME nano2count(long long ns) #define comedi_rt_task_context_t long #endif +/* Finished checking RTAI_VERSION_CODE. */ +#undef cv +#undef test1 +#undef test2 +#undef test3 + #endif /* This defines the fastest speed we will emulate. Note that