diff options
author | Andreas Jaggi <andreas.jaggi@waterwave.ch> | 2007-02-10 04:44:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:25 -0500 |
commit | a3569958728d511912bbe98f3770aa5ada34bd12 (patch) | |
tree | 4b5b46dfdd6b9149314f6c38056f9edb996c388c | |
parent | 37756ced1f145aec18917812c3b8a96dbb47990d (diff) |
[PATCH] mxser: remove ambiguous redefinition of INIT_WORK
Removes an unused and ambiguous redefinition of INIT_WORK()
Signed-off-by: Andreas Jaggi <andreas.jaggi@waterwave.ch>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/char/mxser.h | 8 | ||||
-rw-r--r-- | drivers/char/mxser_new.h | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/char/mxser.h b/drivers/char/mxser.h index 7e188a4d602a..9fe28497eae9 100644 --- a/drivers/char/mxser.h +++ b/drivers/char/mxser.h | |||
@@ -439,12 +439,4 @@ | |||
439 | 439 | ||
440 | #define READ_MOXA_MUST_GDL(baseio) inb((baseio)+MOXA_MUST_GDL_REGISTER) | 440 | #define READ_MOXA_MUST_GDL(baseio) inb((baseio)+MOXA_MUST_GDL_REGISTER) |
441 | 441 | ||
442 | |||
443 | #ifndef INIT_WORK | ||
444 | #define INIT_WORK(_work, _func, _data){ \ | ||
445 | _data->tqueue.routine = _func;\ | ||
446 | _data->tqueue.data = _data;\ | ||
447 | } | ||
448 | #endif | ||
449 | |||
450 | #endif | 442 | #endif |
diff --git a/drivers/char/mxser_new.h b/drivers/char/mxser_new.h index a08f0ecb09ba..55b34a0e8cf6 100644 --- a/drivers/char/mxser_new.h +++ b/drivers/char/mxser_new.h | |||
@@ -439,12 +439,4 @@ | |||
439 | 439 | ||
440 | #define READ_MOXA_MUST_GDL(baseio) inb((baseio)+MOXA_MUST_GDL_REGISTER) | 440 | #define READ_MOXA_MUST_GDL(baseio) inb((baseio)+MOXA_MUST_GDL_REGISTER) |
441 | 441 | ||
442 | |||
443 | #ifndef INIT_WORK | ||
444 | #define INIT_WORK(_work, _func, _data){ \ | ||
445 | _data->tqueue.routine = _func;\ | ||
446 | _data->tqueue.data = _data;\ | ||
447 | } | ||
448 | #endif | ||
449 | |||
450 | #endif | 442 | #endif |