diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-01-10 23:56:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-01-10 23:56:41 +0800 |
| commit | 60d29b4f9bf5466c1d6eccac414765b7ac2e8eb4 (patch) | |
| tree | 51ea304cd736ff03faa6bc568644a9d15b628d4a /drivers/tty | |
| parent | 0a1e99e83990f72055eadd7ab5793b9f63e16834 (diff) | |
| parent | 450cdfa9c5713551ab1438ab210679868b52a994 (diff) | |
| download | juno-60d29b4f9bf5466c1d6eccac414765b7ac2e8eb4.tar.gz | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
include/linux/mm_types.h
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/8250/8250_dw.c | 2 | ||||
| -rw-r--r-- | drivers/tty/serial/pmac_zilog.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index d07b6af3a93..5d880917850 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -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 }, { }, }; diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c index b1785f58b6e..7735bbdccbc 100644 --- a/drivers/tty/serial/pmac_zilog.c +++ b/drivers/tty/serial/pmac_zilog.c @@ -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); |