diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/68328serial.c | 1 | ||||
-rw-r--r-- | drivers/serial/68360serial.c | 8 | ||||
-rw-r--r-- | drivers/serial/crisv10.c | 1 | ||||
-rw-r--r-- | drivers/serial/icom.c | 1 | ||||
-rw-r--r-- | drivers/serial/mcfserial.c | 1 | ||||
-rw-r--r-- | drivers/serial/serial_lh7a40x.c | 4 |
6 files changed, 4 insertions, 12 deletions
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index 9097f2f7b12a..2efb317153ce 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include <asm/io.h> | 40 | #include <asm/io.h> |
41 | #include <asm/irq.h> | 41 | #include <asm/irq.h> |
42 | #include <asm/system.h> | 42 | #include <asm/system.h> |
43 | #include <asm/segment.h> | ||
44 | #include <asm/delay.h> | 43 | #include <asm/delay.h> |
45 | #include <asm/uaccess.h> | 44 | #include <asm/uaccess.h> |
46 | 45 | ||
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c index b116122e569a..170c9d2a749c 100644 --- a/drivers/serial/68360serial.c +++ b/drivers/serial/68360serial.c | |||
@@ -2474,8 +2474,7 @@ static struct tty_operations rs_360_ops = { | |||
2474 | .tiocmset = rs_360_tiocmset, | 2474 | .tiocmset = rs_360_tiocmset, |
2475 | }; | 2475 | }; |
2476 | 2476 | ||
2477 | /* int __init rs_360_init(void) */ | 2477 | static int __init rs_360_init(void) |
2478 | int rs_360_init(void) | ||
2479 | { | 2478 | { |
2480 | struct serial_state * state; | 2479 | struct serial_state * state; |
2481 | ser_info_t *info; | 2480 | ser_info_t *info; |
@@ -2827,10 +2826,7 @@ int rs_360_init(void) | |||
2827 | 2826 | ||
2828 | return 0; | 2827 | return 0; |
2829 | } | 2828 | } |
2830 | 2829 | module_init(rs_360_init); | |
2831 | |||
2832 | |||
2833 | |||
2834 | 2830 | ||
2835 | /* This must always be called before the rs_360_init() function, otherwise | 2831 | /* This must always be called before the rs_360_init() function, otherwise |
2836 | * it blows away the port control information. | 2832 | * it blows away the port control information. |
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index 5690594b257b..40d3e7139cfe 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c | |||
@@ -446,7 +446,6 @@ static char *serial_version = "$Revision: 1.25 $"; | |||
446 | #include <asm/io.h> | 446 | #include <asm/io.h> |
447 | #include <asm/irq.h> | 447 | #include <asm/irq.h> |
448 | #include <asm/system.h> | 448 | #include <asm/system.h> |
449 | #include <asm/segment.h> | ||
450 | #include <asm/bitops.h> | 449 | #include <asm/bitops.h> |
451 | #include <linux/delay.h> | 450 | #include <linux/delay.h> |
452 | 451 | ||
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index 79f8df4d66b7..eb31125c6a30 100644 --- a/drivers/serial/icom.c +++ b/drivers/serial/icom.c | |||
@@ -56,7 +56,6 @@ | |||
56 | #include <linux/bitops.h> | 56 | #include <linux/bitops.h> |
57 | 57 | ||
58 | #include <asm/system.h> | 58 | #include <asm/system.h> |
59 | #include <asm/segment.h> | ||
60 | #include <asm/io.h> | 59 | #include <asm/io.h> |
61 | #include <asm/irq.h> | 60 | #include <asm/irq.h> |
62 | #include <asm/uaccess.h> | 61 | #include <asm/uaccess.h> |
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c index 8c40167778de..43b03c55f453 100644 --- a/drivers/serial/mcfserial.c +++ b/drivers/serial/mcfserial.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include <asm/io.h> | 40 | #include <asm/io.h> |
41 | #include <asm/irq.h> | 41 | #include <asm/irq.h> |
42 | #include <asm/system.h> | 42 | #include <asm/system.h> |
43 | #include <asm/segment.h> | ||
44 | #include <asm/semaphore.h> | 43 | #include <asm/semaphore.h> |
45 | #include <asm/delay.h> | 44 | #include <asm/delay.h> |
46 | #include <asm/coldfire.h> | 45 | #include <asm/coldfire.h> |
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index 32f808d157a1..8302376800c0 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c | |||
@@ -207,7 +207,7 @@ static void lh7a40xuart_tx_chars (struct uart_port* port) | |||
207 | return; | 207 | return; |
208 | } | 208 | } |
209 | if (uart_circ_empty (xmit) || uart_tx_stopped (port)) { | 209 | if (uart_circ_empty (xmit) || uart_tx_stopped (port)) { |
210 | lh7a40xuart_stop_tx (port, 0); | 210 | lh7a40xuart_stop_tx (port); |
211 | return; | 211 | return; |
212 | } | 212 | } |
213 | 213 | ||
@@ -229,7 +229,7 @@ static void lh7a40xuart_tx_chars (struct uart_port* port) | |||
229 | uart_write_wakeup (port); | 229 | uart_write_wakeup (port); |
230 | 230 | ||
231 | if (uart_circ_empty (xmit)) | 231 | if (uart_circ_empty (xmit)) |
232 | lh7a40xuart_stop_tx (port, 0); | 232 | lh7a40xuart_stop_tx (port); |
233 | } | 233 | } |
234 | 234 | ||
235 | static void lh7a40xuart_modem_status (struct uart_port* port) | 235 | static void lh7a40xuart_modem_status (struct uart_port* port) |