diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/cyclades.h | 3 | ||||
-rw-r--r-- | include/linux/serial_core.h | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index 83925bd12c0b..05ee0f19448a 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h | |||
@@ -157,6 +157,9 @@ struct cyclades_port { | |||
157 | struct cyclades_icount icount; | 157 | struct cyclades_icount icount; |
158 | struct completion shutdown_wait; | 158 | struct completion shutdown_wait; |
159 | int throttle; | 159 | int throttle; |
160 | #ifdef CONFIG_CYZ_INTR | ||
161 | struct timer_list rx_full_timer; | ||
162 | #endif | ||
160 | }; | 163 | }; |
161 | 164 | ||
162 | #define CLOSING_WAIT_DELAY 30*HZ | 165 | #define CLOSING_WAIT_DELAY 30*HZ |
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 5553e04e59c9..37b044e78333 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
@@ -501,4 +501,9 @@ static inline int uart_handle_break(struct uart_port *port) | |||
501 | (cflag) & CRTSCTS || \ | 501 | (cflag) & CRTSCTS || \ |
502 | !((cflag) & CLOCAL)) | 502 | !((cflag) & CLOCAL)) |
503 | 503 | ||
504 | /* | ||
505 | * Common device tree parsing helpers | ||
506 | */ | ||
507 | void of_get_rs485_mode(struct device_node *np, struct serial_rs485 *rs485conf); | ||
508 | |||
504 | #endif /* LINUX_SERIAL_CORE_H */ | 509 | #endif /* LINUX_SERIAL_CORE_H */ |