mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge commit 'origin/HEAD' into test-merge
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
This commit is contained in:
commit
11c2d8174e
358 changed files with 10867 additions and 1162 deletions
|
|
@ -2623,6 +2623,9 @@ static struct console serial8250_console = {
|
|||
|
||||
static int __init serial8250_console_init(void)
|
||||
{
|
||||
if (nr_uarts > UART_NR)
|
||||
nr_uarts = UART_NR;
|
||||
|
||||
serial8250_isa_init_ports();
|
||||
register_console(&serial8250_console);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -1991,7 +1991,9 @@ struct uart_match {
|
|||
static int serial_match_port(struct device *dev, void *data)
|
||||
{
|
||||
struct uart_match *match = data;
|
||||
dev_t devt = MKDEV(match->driver->major, match->driver->minor) + match->port->line;
|
||||
struct tty_driver *tty_drv = match->driver->tty_driver;
|
||||
dev_t devt = MKDEV(tty_drv->major, tty_drv->minor_start) +
|
||||
match->port->line;
|
||||
|
||||
return dev->devt == devt; /* Actually, only one tty per port */
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue