summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-16 20:06:51 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-16 20:06:51 -0700
commitf60f700876cd51de9de69f3a3c865d95e287a24d (patch)
tree4ef50e96c385ed076465aac23f52902467e7d825 /include
parentc6c621b3a977b20d7ceffd3debcacbe3de7c0e87 (diff)
parent6d283d271674b1127881ebf082266a2c3fe6e0e4 (diff)
downloadlinux-3.10-f60f700876cd51de9de69f3a3c865d95e287a24d.tar.gz
linux-3.10-f60f700876cd51de9de69f3a3c865d95e287a24d.tar.bz2
linux-3.10-f60f700876cd51de9de69f3a3c865d95e287a24d.zip
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include')
-rw-r--r--include/linux/serial.h6
-rw-r--r--include/linux/serialP.h1
-rw-r--r--include/linux/serial_core.h5
3 files changed, 7 insertions, 5 deletions
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);