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

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

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

parents e766f1cc 9b4e3b13

Documentation/feature-removal-schedule.txt

+0 −10
Original line number Diff line number Diff line
@@ -102,16 +102,6 @@ Who: Jody McIntyre <scjody@steamballoon.com> 


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



What:	register_serial/unregister_serial

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, or platform devices instead.

Who:	Russell King <rmk@arm.linux.org.uk>



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



What:	i2c sysfs name change: in1_ref, vid deprecated in favour of cpu0_vid

When:	November 2005

Files:	drivers/i2c/chips/adm1025.c, drivers/i2c/chips/adm1026.c

drivers/char/moxa.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static int __init moxa_init(void) 


	init_MUTEX(&moxaBuffSem);

	moxaDriver->owner = THIS_MODULE;

	moxaDriver->name = "ttya";

	moxaDriver->name = "ttyMX";

	moxaDriver->devfs_name = "tts/a";

	moxaDriver->major = ttymajor;

	moxaDriver->minor_start = 0;

drivers/serial/crisv10.c

+0 −14
Original line number Diff line number Diff line
@@ -5041,17 +5041,3 @@ rs_init(void) 
/* this makes sure that rs_init is called during kernel boot */



module_init(rs_init);
 


/*

 * register_serial and unregister_serial allows for serial ports to be

 * configured at run-time, to support PCMCIA modems.

 */

int

register_serial(struct serial_struct *req)

{

	return -1;

}



void unregister_serial(int line)

{

}

drivers/serial/serial_core.c

+14 −6
Original line number Diff line number Diff line
@@ -1947,21 +1947,29 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port) 
static inline void

uart_report_port(struct uart_driver *drv, struct uart_port *port)

{

	printk("%s%d", drv->dev_name, port->line);

	printk(" at ");

	char address[64];



	switch (port->iotype) {

	case UPIO_PORT:

		printk("I/O 0x%x", port->iobase);

		snprintf(address, sizeof(address),

			 "I/O 0x%x", port->iobase);

		break;

	case UPIO_HUB6:

		printk("I/O 0x%x offset 0x%x", port->iobase, port->hub6);

		snprintf(address, sizeof(address),

			 "I/O 0x%x offset 0x%x", port->iobase, port->hub6);

		break;

	case UPIO_MEM:

	case UPIO_MEM32:

		printk("MMIO 0x%lx", port->mapbase);

		snprintf(address, sizeof(address),

			 "MMIO 0x%lx", port->mapbase);

		break;

	default:

		strlcpy(address, "*unknown*", sizeof(address));

		break;

	}

	printk(" (irq = %d) is a %s\n", port->irq, uart_type(port));



	printk(KERN_INFO "%s%d at %s (irq = %d) is a %s\n",

	       drv->dev_name, port->line, address, port->irq, uart_type(port));

}



static void