Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f60f7008 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents c6c621b3 6d283d27

Documentation/feature-removal-schedule.txt

+2 −2
Original line number Diff line number Diff line
@@ -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>



---------------------------

drivers/serial/crisv10.c

+0 −2
Original line number Diff line number Diff line
@@ -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>

drivers/serial/icom.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/serial/jsm/jsm.h

+0 −1
Original line number Diff line number Diff line
@@ -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>

include/linux/serial.h

+4 −2
Original line number Diff line number Diff line
@@ -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 */