diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:24 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:24 +0200 |
| commit | 904298deb07d532a76de153a42c6f678d2e4c740 (patch) | |
| tree | 613d135d183962bf4dee1f5aef9449fbaceb0acd /drivers/serial | |
| parent | ebf9022f2eee564fc4b0e4b37a8267319923d808 (diff) | |
| parent | fe4ecd1dbfc44d0fe420e8b28a984738d74f3b69 (diff) | |
| download | barebox-904298deb07d532a76de153a42c6f678d2e4c740.tar.gz barebox-904298deb07d532a76de153a42c6f678d2e4c740.tar.xz | |
Merge branch 'for-next/socfpga'
Conflicts:
scripts/Makefile
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_ns16550.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 59b509c280..d3a5a8176b 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -307,6 +307,8 @@ err: static struct of_device_id ns16550_serial_dt_ids[] = { { .compatible = "ns16550a", + },{ + .compatible = "snps,dw-apb-uart", }, { /* sentinel */ }, |