aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorMario Six2018-04-27 14:53:37 +0200
committerTom Rini2018-05-08 18:50:23 -0400
commite097ce4304056452704f54245e28a6badb59fe06 (patch)
tree2d49482c7e11f4fd1cf8eb27ad3379871a6f1cbd /drivers/pci
parent86da8c12ef0f86c7bd7a1cf95d71806dd9022969 (diff)
pci: Don't use pci_indirect when DM is active
Declaration of indirect PCI bridges is not compatible with DM: Both define PCI operations, but in different ways. Hence, don't use indirect bridges if DM is active. Signed-off-by: Mario Six <mario.six@gdsys.cc> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci_indirect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci_indirect.c b/drivers/pci/pci_indirect.c
index a24100e3a88..6134c22d1bc 100644
--- a/drivers/pci/pci_indirect.c
+++ b/drivers/pci/pci_indirect.c
@@ -7,7 +7,7 @@
#include <common.h>
-#if !defined(__I386__)
+#if !defined(__I386__) && !defined(CONFIG_DM_PCI)
#include <asm/processor.h>
#include <asm/io.h>