diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
| commit | fced6dee29f6fb143fe16ea90331176ff77e6120 (patch) | |
| tree | 5b6e57e7a757adc2a6518ce291a4d2914397b917 /drivers/tty/serial/efm32-uart.c | |
| parent | bfed1074f213051e94648bfad0d0611a16d81366 (diff) | |
| parent | be1f7c8d7e2bc8b8c76846aa6f276e8d2ef8975a (diff) | |
Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos
Diffstat (limited to 'drivers/tty/serial/efm32-uart.c')
| -rw-r--r-- | drivers/tty/serial/efm32-uart.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c index 028582e924a5..c167a710dc39 100644 --- a/drivers/tty/serial/efm32-uart.c +++ b/drivers/tty/serial/efm32-uart.c | |||
| @@ -798,6 +798,9 @@ static int efm32_uart_remove(struct platform_device *pdev) | |||
| 798 | 798 | ||
| 799 | static const struct of_device_id efm32_uart_dt_ids[] = { | 799 | static const struct of_device_id efm32_uart_dt_ids[] = { |
| 800 | { | 800 | { |
| 801 | .compatible = "energymicro,efm32-uart", | ||
| 802 | }, { | ||
| 803 | /* doesn't follow the "vendor,device" scheme, don't use */ | ||
| 801 | .compatible = "efm32,uart", | 804 | .compatible = "efm32,uart", |
| 802 | }, { | 805 | }, { |
| 803 | /* sentinel */ | 806 | /* sentinel */ |