projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-i2c
[oweals/u-boot.git]
/
drivers
/
pci
/
pci_auto.c
diff --git
a/drivers/pci/pci_auto.c
b/drivers/pci/pci_auto.c
index c20b981b89cd693c04bc3dfb203b653fa3ad5876..87ee2c2408b481291e0970175f23c72874612f7b 100644
(file)
--- a/
drivers/pci/pci_auto.c
+++ b/
drivers/pci/pci_auto.c
@@
-1,5
+1,5
@@
/*
/*
- * arch/ppc/kernel/pci_auto.c
+ * arch/p
ower
pc/kernel/pci_auto.c
*
* PCI autoconfiguration library
*
*
* PCI autoconfiguration library
*
@@
-403,7
+403,7
@@
int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
PCI_DEV(dev));
break;
#endif
PCI_DEV(dev));
break;
#endif
-#if
def CONFIG_MPC834X
+#if
defined(CONFIG_MPC834x) && !defined(CONFIG_VME8349)
case PCI_CLASS_BRIDGE_OTHER:
/*
* The host/PCI bridge 1 seems broken in 8349 - it presents
case PCI_CLASS_BRIDGE_OTHER:
/*
* The host/PCI bridge 1 seems broken in 8349 - it presents