summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorPeter Pearse <peter.pearse@arm.com>2007-09-11 15:31:55 +0100
committerPeter Pearse <peter.pearse@arm.com>2007-09-11 15:31:55 +0100
commit1fc11f736c720c12c772b989f734fcf5be91332b (patch)
tree9b2a8d4397daa8f4ae233680d37be6d5c962e435 /board
parent9d3cb9febe859d6cc628ede2cc0175289101826a (diff)
parent38ad82da0c1180ecdeb212a8f4245e945bcc546e (diff)
downloadu-boot-imx-1fc11f736c720c12c772b989f734fcf5be91332b.zip
u-boot-imx-1fc11f736c720c12c772b989f734fcf5be91332b.tar.gz
u-boot-imx-1fc11f736c720c12c772b989f734fcf5be91332b.tar.bz2
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board')
-rw-r--r--board/stxssa/stxssa.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c
index 5882124..9a2bfbe 100644
--- a/board/stxssa/stxssa.c
+++ b/board/stxssa/stxssa.c
@@ -378,9 +378,12 @@ 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,},
+#ifdef CONFIG_MPC85XX_PCI2
+ {},
+#endif
#endif
};
@@ -393,6 +396,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 */
}