Merge with git://www.denx.de/git/u-boot.git

[u-boot] / board / stxssa / stxssa.c

diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c
index 5882124150e49dc479e300e21483ff87a2c0be8e..9bacb98d86589a8f02b24c8474179a60f6278be9 100644 (file)
--- a/board/stxssa/stxssa.c
+++ b/board/stxssa/stxssa.c
@@ -378,9 +378,14 @@ static struct pci_config_table pci_stxgp3_config_table[] = {
 #endif
 
 
-static struct pci_controller hose = {
+static struct pci_controller hose[] = {
 #ifndef CONFIG_PCI_PNP
-       config_table: pci_stxgp3_config_table,
+       { config_table: pci_stxgp3_config_table,},
+#else
+       {},
+#endif
+#ifdef CONFIG_MPC85XX_PCI2
+       {},
 #endif
 };
 
@@ -393,6 +398,6 @@ pci_init_board(void)
 #ifdef CONFIG_PCI
        extern void pci_mpc85xx_init(struct pci_controller *hose);
 
-       pci_mpc85xx_init(&hose);
+       pci_mpc85xx_init(hose);
 #endif /* CONFIG_PCI */
 }