Merge master.kernel.org:/home/rmk/linux-2.6-serial
This commit is contained in:
commit
f60f700876
|
@ -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>
|
||||||
|
|
||||||
---------------------------
|
---------------------------
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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 */
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue