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 /lib/fdtdec.c | |
| 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 'lib/fdtdec.c')
| -rw-r--r-- | lib/fdtdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 7bbc6d445e4..6f8ec0dbed7 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -200,7 +200,7 @@ fdt_addr_t fdtdec_get_addr(const void *blob, int node, const char *prop_name) return fdtdec_get_addr_size(blob, node, prop_name, NULL); } -#if defined(CONFIG_PCI) && defined(CONFIG_DM_PCI) +#if CONFIG_IS_ENABLED(PCI) && defined(CONFIG_DM_PCI) int fdtdec_get_pci_addr(const void *blob, int node, enum fdt_pci_space type, const char *prop_name, struct fdt_pci_addr *addr) { |