Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6-omap-h63xx.git] / drivers / char / mxser.h

diff --git a/drivers/char/mxser.h b/drivers/char/mxser.h
index 7e188a4d602a7060915a89eda89d95533bfc2636..1f4aa45ec004436aac1e80b03eb46dac02876741 100644 (file)
--- a/drivers/char/mxser.h
+++ b/drivers/char/mxser.h
@@ -30,8 +30,7 @@
 
 #define TTY_THRESHOLD_THROTTLE  128
 
-#define LO_WATER               (TTY_FLIPBUF_SIZE)
-#define HI_WATER               (TTY_FLIPBUF_SIZE*2*3/4)
+#define HI_WATER               768
 
 // added by James. 03-11-2004.
 #define MOXA_SDS_GETICOUNTER   (MOXA + 68)
@@ -439,12 +438,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