diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-07-19 14:36:00 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-07-19 14:36:00 -0700 |
| commit | 076fb01e8238b7e5d68ba0d729c0ff7716d1d8ec (patch) | |
| tree | abcaefe016870427ed289748cb0b936575d60593 /include/linux/serial_core.h | |
| parent | 4c48b0d3d1c7ff9f13134b30e41c6e81a92027bf (diff) | |
| parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/serial_core.h')
| -rw-r--r-- | include/linux/serial_core.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index d6025af7efa..30b64f3534f 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -122,6 +122,7 @@ #ifdef __KERNEL__ #include <linux/config.h> +#include <linux/compiler.h> #include <linux/interrupt.h> #include <linux/circ_buf.h> #include <linux/spinlock.h> @@ -359,8 +360,8 @@ struct tty_driver *uart_console_device(struct console *co, int *index); */ int uart_register_driver(struct uart_driver *uart); void uart_unregister_driver(struct uart_driver *uart); -void uart_unregister_port(struct uart_driver *reg, int line); -int uart_register_port(struct uart_driver *reg, struct uart_port *port); +void __deprecated uart_unregister_port(struct uart_driver *reg, int line); +int __deprecated uart_register_port(struct uart_driver *reg, struct uart_port *port); int uart_add_one_port(struct uart_driver *reg, struct uart_port *port); int uart_remove_one_port(struct uart_driver *reg, struct uart_port *port); int uart_match_port(struct uart_port *port1, struct uart_port *port2); |