diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2009-04-14 11:04:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 11:00:30 -0700 |
commit | 4bde29ed2220c3089e93258e476e3a7f4fc388a1 (patch) | |
tree | 88c1f887795a05a1242295618db9f5d3d32ddb15 /drivers/staging/comedi | |
parent | 5b32f4397a93a2819a71438a7ba11650529827e8 (diff) | |
download | kernel_samsung_smdk4412-4bde29ed2220c3089e93258e476e3a7f4fc388a1.zip kernel_samsung_smdk4412-4bde29ed2220c3089e93258e476e3a7f4fc388a1.tar.gz kernel_samsung_smdk4412-4bde29ed2220c3089e93258e476e3a7f4fc388a1.tar.bz2 |
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>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r-- | 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> |