aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2008-02-07 03:16:34 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 11:42:33 -0500
commit1237a2ef31cf60e01bbecbe198d8c002bbb710db (patch)
tree1d71f11a023c4ab0262000e90d311223b5ecc28e /drivers
parentf6de0c9864c10d17f2473940c5f81718a5064bd8 (diff)
Char: char/serial, remove SERIAL_TYPE_NORMAL redefines
Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/epca.h1
-rw-r--r--drivers/char/esp.c3
-rw-r--r--drivers/char/ip2/ip2main.c3
-rw-r--r--drivers/char/mxser.c3
-rw-r--r--drivers/char/serial167.c2
-rw-r--r--drivers/char/sx.h2
-rw-r--r--drivers/serial/68328serial.c3
-rw-r--r--drivers/serial/crisv10.c5
8 files changed, 0 insertions, 22 deletions
diff --git a/drivers/char/epca.h b/drivers/char/epca.h
index a297238cd3ba..3c77c02b5d65 100644
--- a/drivers/char/epca.h
+++ b/drivers/char/epca.h
@@ -77,7 +77,6 @@ static char *board_desc[] =
77#define ON 1 77#define ON 1
78 78
79#define FEPTIMEOUT 200000 79#define FEPTIMEOUT 200000
80#define SERIAL_TYPE_NORMAL 1
81#define SERIAL_TYPE_INFO 3 80#define SERIAL_TYPE_INFO 3
82#define EPCA_EVENT_HANGUP 1 81#define EPCA_EVENT_HANGUP 1
83#define EPCA_MAGIC 0x5c6df104L 82#define EPCA_MAGIC 0x5c6df104L
diff --git a/drivers/char/esp.c b/drivers/char/esp.c
index 28607763ae64..b5df2dc40491 100644
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
@@ -111,9 +111,6 @@ static char serial_version[] __initdata = "2.2";
111 111
112static struct tty_driver *esp_driver; 112static struct tty_driver *esp_driver;
113 113
114/* serial subtype definitions */
115#define SERIAL_TYPE_NORMAL 1
116
117/* 114/*
118 * Serial driver configuration section. Here are the various options: 115 * Serial driver configuration section. Here are the various options:
119 * 116 *
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 0f49ccf02a7f..b1d6cad84282 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -153,9 +153,6 @@ static char *pcVersion = "1.2.14";
153static char *pcDriver_name = "ip2"; 153static char *pcDriver_name = "ip2";
154static char *pcIpl = "ip2ipl"; 154static char *pcIpl = "ip2ipl";
155 155
156/* Serial subtype definitions */
157#define SERIAL_TYPE_NORMAL 1
158
159// cheezy kludge or genius - you decide? 156// cheezy kludge or genius - you decide?
160int ip2_loadmain(int *, int *, unsigned char *, int); 157int ip2_loadmain(int *, int *, unsigned char *, int);
161static unsigned char *Fip_firmware; 158static unsigned char *Fip_firmware;
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 47420787a017..5d7901096048 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -81,9 +81,6 @@
81#define MXSER_ERR_IRQ_CONFLIT -3 81#define MXSER_ERR_IRQ_CONFLIT -3
82#define MXSER_ERR_VECTOR -4 82#define MXSER_ERR_VECTOR -4
83 83
84#define SERIAL_TYPE_NORMAL 1
85#define SERIAL_TYPE_CALLOUT 2
86
87#define WAKEUP_CHARS 256 84#define WAKEUP_CHARS 256
88 85
89#define UART_MCR_AFE 0x20 86#define UART_MCR_AFE 0x20
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index f1497cecffd8..cbf21cc7b56d 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -90,8 +90,6 @@
90 90
91#define STD_COM_FLAGS (0) 91#define STD_COM_FLAGS (0)
92 92
93#define SERIAL_TYPE_NORMAL 1
94
95static struct tty_driver *cy_serial_driver; 93static struct tty_driver *cy_serial_driver;
96extern int serial_console; 94extern int serial_console;
97static struct cyclades_port *serial_console_info = NULL; 95static struct cyclades_port *serial_console_info = NULL;
diff --git a/drivers/char/sx.h b/drivers/char/sx.h
index 70d9783c7323..87c2defdead7 100644
--- a/drivers/char/sx.h
+++ b/drivers/char/sx.h
@@ -88,8 +88,6 @@ struct vpd_prom {
88 88
89#define IS_CF_BOARD(board) (board->flags & (SX_CFISA_BOARD | SX_CFPCI_BOARD)) 89#define IS_CF_BOARD(board) (board->flags & (SX_CFISA_BOARD | SX_CFPCI_BOARD))
90 90
91#define SERIAL_TYPE_NORMAL 1
92
93/* The SI processor clock is required to calculate the cc_int_count register 91/* The SI processor clock is required to calculate the cc_int_count register
94 value for the SI cards. */ 92 value for the SI cards. */
95#define SI_PROCESSOR_CLOCK 25000000 93#define SI_PROCESSOR_CLOCK 25000000
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index 0d99120ab5a2..2b8a410e0959 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -84,9 +84,6 @@ extern wait_queue_head_t keypress_wait;
84 84
85struct tty_driver *serial_driver; 85struct tty_driver *serial_driver;
86 86
87/* serial subtype definitions */
88#define SERIAL_TYPE_NORMAL 1
89
90/* number of characters left in xmit buffer before we ask for more */ 87/* number of characters left in xmit buffer before we ask for more */
91#define WAKEUP_CHARS 256 88#define WAKEUP_CHARS 256
92 89
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index a4e23cf47906..383c4e660cd5 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -68,11 +68,6 @@ static char *serial_version = "$Revision: 1.25 $";
68 68
69struct tty_driver *serial_driver; 69struct tty_driver *serial_driver;
70 70
71/* serial subtype definitions */
72#ifndef SERIAL_TYPE_NORMAL
73#define SERIAL_TYPE_NORMAL 1
74#endif
75
76/* number of characters left in xmit buffer before we ask for more */ 71/* number of characters left in xmit buffer before we ask for more */
77#define WAKEUP_CHARS 256 72#define WAKEUP_CHARS 256
78 73