The patch titled
mxser: remove ambiguous redefinition of INIT_WORK
has been added to the -mm tree. Its filename is
mxser-remove-ambiguous-redefinition-of-init_work.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: mxser: remove ambiguous redefinition of INIT_WORK
From: Andreas Jaggi <andreas.jaggi@xxxxxxxxxxxx>
Removes an unused and ambiguous redefinition of INIT_WORK()
Signed-off-by: Andreas Jaggi <andreas.jaggi@xxxxxxxxxxxx>
Acked-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/mxser.h | 8 --------
drivers/char/mxser_new.h | 8 --------
2 files changed, 16 deletions(-)
diff -puN drivers/char/mxser.h~mxser-remove-ambiguous-redefinition-of-init_work drivers/char/mxser.h
--- a/drivers/char/mxser.h~mxser-remove-ambiguous-redefinition-of-init_work
+++ a/drivers/char/mxser.h
@@ -439,12 +439,4 @@
#define READ_MOXA_MUST_GDL(baseio) inb((baseio)+MOXA_MUST_GDL_REGISTER)
-
-#ifndef INIT_WORK
-#define INIT_WORK(_work, _func, _data){ \
- _data->tqueue.routine = _func;\
- _data->tqueue.data = _data;\
- }
-#endif
-
#endif
diff -puN drivers/char/mxser_new.h~mxser-remove-ambiguous-redefinition-of-init_work drivers/char/mxser_new.h
--- a/drivers/char/mxser_new.h~mxser-remove-ambiguous-redefinition-of-init_work
+++ a/drivers/char/mxser_new.h
@@ -439,12 +439,4 @@
#define READ_MOXA_MUST_GDL(baseio) inb((baseio)+MOXA_MUST_GDL_REGISTER)
-
-#ifndef INIT_WORK
-#define INIT_WORK(_work, _func, _data){ \
- _data->tqueue.routine = _func;\
- _data->tqueue.data = _data;\
- }
-#endif
-
#endif
_
Patches currently in -mm which might be from andreas.jaggi@xxxxxxxxxxxx are
mxser-remove-ambiguous-redefinition-of-init_work.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
