Updated from Linux LTS 3.10.25 to 3.10.26
This commit is contained in:
@@ -369,6 +369,8 @@ MODULE_DEVICE_TABLE(of, dw8250_of_match);
|
||||
static const struct acpi_device_id dw8250_acpi_match[] = {
|
||||
{ "INT33C4", 0 },
|
||||
{ "INT33C5", 0 },
|
||||
{ "INT3434", 0 },
|
||||
{ "INT3435", 0 },
|
||||
{ "80860F0A", 0 },
|
||||
{ },
|
||||
};
|
||||
|
||||
@@ -2051,6 +2051,9 @@ static int __init pmz_console_init(void)
|
||||
/* Probe ports */
|
||||
pmz_probe();
|
||||
|
||||
if (pmz_ports_count == 0)
|
||||
return -ENODEV;
|
||||
|
||||
/* TODO: Autoprobe console based on OF */
|
||||
/* pmz_console.index = i; */
|
||||
register_console(&pmz_console);
|
||||
|
||||
Reference in New Issue
Block a user