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

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

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

parents bd53d127 44454bcd

drivers/serial/8250.c

+2 −1
Original line number Diff line number Diff line
@@ -2061,7 +2061,8 @@ static void __init serial8250_isa_init_ports(void) 
		up->port.ops = &serial8250_pops;

	}



	for (i = 0, up = serial8250_ports; i < ARRAY_SIZE(old_serial_port);

	for (i = 0, up = serial8250_ports;

	     i < ARRAY_SIZE(old_serial_port) && i < UART_NR;

	     i++, up++) {

		up->port.iobase   = old_serial_port[i].port;

		up->port.irq      = irq_canonicalize(old_serial_port[i].irq);