OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge master.kernel.org:/home/rmk/linux-2.6-serial

This commit is contained in:
Linus Torvalds 2005-07-16 20:06:51 -07:00
parent c6c621b3a9 6d283d2716
commit f60f700876
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/feature-removal-schedule.txt
View File

@ -103,11 +103,11 @@ Who: Jody McIntyre <scjody@steamballoon.com>
--------------------------- ---------------------------
What: register_serial/unregister_serial What: register_serial/unregister_serial
When: December 2005 When: September 2005
Why: This interface does not allow serial ports to be registered against Why: This interface does not allow serial ports to be registered against
a struct device, and as such does not allow correct power management a struct device, and as such does not allow correct power management
of such ports. 8250-based ports should use serial8250_register_port 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> Who: Russell King <rmk@arm.linux.org.uk>
--------------------------- ---------------------------

2
drivers/serial/crisv10.c
View File

@ -426,8 +426,6 @@
static char *serial_version = "$Revision: 1.25 $"; static char *serial_version = "$Revision: 1.25 $";
#include <linux/config.h> #include <linux/config.h>
#include <linux/version.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/signal.h> #include <linux/signal.h>

1
drivers/serial/icom.c
View File

@ -25,7 +25,6 @@
#define SERIAL_DO_RESTART #define SERIAL_DO_RESTART
#include <linux/module.h> #include <linux/module.h>
#include <linux/config.h> #include <linux/config.h>
#include <linux/version.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/signal.h> #include <linux/signal.h>

1
drivers/serial/jsm/jsm.h
View File

@ -28,7 +28,6 @@
#define __JSM_DRIVER_H #define __JSM_DRIVER_H
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/version.h>
#include <linux/types.h> /* To pick up the varions Linux types */ #include <linux/types.h> /* To pick up the varions Linux types */
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>

6
include/linux/serial.h
View File

@ -174,9 +174,11 @@ struct serial_icounter_struct {
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/compiler.h>
/* Export to allow PCMCIA to use this - Dave Hinds */ /* Export to allow PCMCIA to use this - Dave Hinds */
extern int register_serial(struct serial_struct *req); extern int __deprecated register_serial(struct serial_struct *req);
extern void unregister_serial(int line); extern void __deprecated unregister_serial(int line);
/* Allow architectures to override entries in serial8250_ports[] at run time: */ /* Allow architectures to override entries in serial8250_ports[] at run time: */
struct uart_port; /* forward declaration */ struct uart_port; /* forward declaration */

1
include/linux/serialP.h
View File

@ -19,7 +19,6 @@
* For definitions of the flags field, see tty.h * For definitions of the flags field, see tty.h
*/ */
#include <linux/version.h>
#include <linux/config.h> #include <linux/config.h>
#include <linux/termios.h> #include <linux/termios.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>

5
include/linux/serial_core.h
View File

@ -122,6 +122,7 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/config.h> #include <linux/config.h>
#include <linux/compiler.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/circ_buf.h> #include <linux/circ_buf.h>
#include <linux/spinlock.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); int uart_register_driver(struct uart_driver *uart);
void uart_unregister_driver(struct uart_driver *uart); void uart_unregister_driver(struct uart_driver *uart);
void uart_unregister_port(struct uart_driver *reg, int line); void __deprecated uart_unregister_port(struct uart_driver *reg, int line);
int uart_register_port(struct uart_driver *reg, struct uart_port *port); 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_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_remove_one_port(struct uart_driver *reg, struct uart_port *port);
int uart_match_port(struct uart_port *port1, struct uart_port *port2); int uart_match_port(struct uart_port *port1, struct uart_port *port2);