From: Andreas Jaggi <andreas.jaggi@waterwave.ch>
Date: Sat, 10 Feb 2007 09:44:50 +0000 (-0800)
Subject: [PATCH] mxser: remove ambiguous redefinition of INIT_WORK
X-Git-Tag: v2.6.21-rc1~274^2~368
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a3569958728d511912bbe98f3770aa5ada34bd12;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/drivers/char/mxser.h b/drivers/char/mxser.h
index 7e188a4d602..9fe28497eae 100644
--- a/drivers/char/mxser.h
+++ b/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 --git a/drivers/char/mxser_new.h b/drivers/char/mxser_new.h
index a08f0ecb09b..55b34a0e8cf 100644
--- a/drivers/char/mxser_new.h
+++ b/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