diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-12 19:45:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-12 19:45:07 -0500 |
| commit | 277b06684ddf5231ce1e684ee2860aedacb32b3c (patch) | |
| tree | 90df350acedf6dd201f2506b40fc6243d11a2d73 /drivers/serial | |
| parent | ee168783ae889cf449cee36cc1e51e108a210ed4 (diff) | |
| parent | dda9af3ad156c5b765d31a0646d01bfbb1977d9a (diff) | |
Merge branch '2018-12-12-master-imports'
- Various small TI platform updates
- Two unit test fixes
- qemu-arm updates
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/ns16550.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index f3bd8dbcdf..560ca2ae34 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -425,7 +425,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) /* try Processor Local Bus device first */ addr = dev_read_addr(dev); -#if defined(CONFIG_PCI) && defined(CONFIG_DM_PCI) +#if CONFIG_IS_ENABLED(PCI) && defined(CONFIG_DM_PCI) if (addr == FDT_ADDR_T_NONE) { /* then try pci device */ struct fdt_pci_addr pci_addr; |