diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-05-21 10:02:25 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-05-21 10:02:25 +0800 |
| commit | baf41996d83a6ecd270be42ca1870592827fb30d (patch) | |
| tree | fd59f83bdadfc43ed9b18b4ef5dc5f01f715d1fd /drivers/tty/serial/of_serial.c | |
| parent | 8a95b5736641a5cd3996e4fe4c0af6ea05cfa86c (diff) | |
| parent | b5bac1f597ae5669dee0d2ae927b8ded0b8f6b34 (diff) | |
Merge tag 'v3.10.79' into linux-linaro-lsk-v3.10
This is the 3.10.79 stable release
Diffstat (limited to 'drivers/tty/serial/of_serial.c')
| -rw-r--r-- | drivers/tty/serial/of_serial.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 39c7ea4cb14f..2225f83f4c04 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c @@ -262,7 +262,6 @@ static struct of_device_id of_platform_serial_table[] = { { .compatible = "ibm,qpace-nwp-serial", .data = (void *)PORT_NWPSERIAL, }, #endif - { .type = "serial", .data = (void *)PORT_UNKNOWN, }, { /* end of list */ }, }; |