diff options
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 4 | ||||
| -rw-r--r-- | drivers/serial/crisv10.c | 2 | ||||
| -rw-r--r-- | drivers/serial/icom.c | 1 | ||||
| -rw-r--r-- | drivers/serial/jsm/jsm.h | 1 | ||||
| -rw-r--r-- | include/linux/serial.h | 6 | ||||
| -rw-r--r-- | include/linux/serialP.h | 1 | ||||
| -rw-r--r-- | include/linux/serial_core.h | 5 |
7 files changed, 9 insertions, 11 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 12dde43fe65..8b1430b4665 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -103,11 +103,11 @@ Who: Jody McIntyre <scjody@steamballoon.com> --------------------------- What: register_serial/unregister_serial -When: December 2005 +When: September 2005 Why: This interface does not allow serial ports to be registered against a struct device, and as such does not allow correct power management of such ports. 8250-based ports should use serial8250_register_port - and serial8250_unregister_port instead. + and serial8250_unregister_port, or platform devices instead. Who: Russell King <rmk@arm.linux.org.uk> --------------------------- diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index 3da5494953a..23b8871e74c 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c @@ -426,8 +426,6 @@ static char *serial_version = "$Revision: 1.25 $"; #include <linux/config.h> -#include <linux/version.h> - #include <linux/types.h> #include <linux/errno.h> #include <linux/signal.h> diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index 546a0bc77e1..c112b32764e 100644 --- a/drivers/serial/icom.c +++ b/drivers/serial/icom.c @@ -25,7 +25,6 @@ #define SERIAL_DO_RESTART #include <linux/module.h> #include <linux/config.h> -#include <linux/version.h> #include <linux/kernel.h> #include <linux/errno.h> #include <linux/signal.h> diff --git a/drivers/serial/jsm/jsm.h b/drivers/serial/jsm/jsm.h index 777829fa330..5bf3c45521f 100644 --- a/drivers/serial/jsm/jsm.h +++ b/drivers/serial/jsm/jsm.h @@ -28,7 +28,6 @@ #define __JSM_DRIVER_H #include <linux/kernel.h> -#include <linux/version.h> #include <linux/types.h> /* To pick up the varions Linux types */ #include <linux/tty.h> #include <linux/serial_core.h> diff --git a/include/linux/serial.h b/include/linux/serial.h index 00145822fb7..9f2d85284d0 100644 --- a/include/linux/serial.h +++ b/include/linux/serial.h @@ -174,9 +174,11 @@ struct serial_icounter_struct { #ifdef __KERNEL__ +#include <linux/compiler.h> + /* Export to allow PCMCIA to use this - Dave Hinds */ -extern int register_serial(struct serial_struct *req); -extern void unregister_serial(int line); +extern int __deprecated register_serial(struct serial_struct *req); +extern void __deprecated unregister_serial(int line); /* Allow architectures to override entries in serial8250_ports[] at run time: */ struct uart_port; /* forward declaration */ diff --git a/include/linux/serialP.h b/include/linux/serialP.h index 2307f11d8a6..2b2f35a64d7 100644 --- a/include/linux/serialP.h +++ b/include/linux/serialP.h @@ -19,7 +19,6 @@ * For definitions of the flags field, see tty.h */ -#include <linux/version.h> #include <linux/config.h> #include <linux/termios.h> #include <linux/workqueue.h> 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); |