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 9a2bfbef8e47e05cea28d720ab4bfbb5eb8391d9..9bacb98d86589a8f02b24c8474179a60f6278be9 100644 (file)
--- a/board/stxssa/stxssa.c
+++ b/board/stxssa/stxssa.c
@@ -381,9 +381,11 @@ static struct pci_config_table pci_stxgp3_config_table[] = {
 static struct pci_controller hose[] = {
 #ifndef CONFIG_PCI_PNP
        { config_table: pci_stxgp3_config_table,},
-#ifdef CONFIG_MPC85XX_PCI2
+#else
        {},
 #endif
+#ifdef CONFIG_MPC85XX_PCI2
+       {},
 #endif
 };