diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-09-24 00:04:22 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-09-24 00:04:22 +0200 |
| commit | 6b6f287a33ae8c340f97fb08ed95b6687e2baa4b (patch) | |
| tree | 57d0aa201f36c6dd5a43efd23a0ee2ded95440ba /board/stxssa/stxssa.c | |
| parent | d45963854eff39d575124d859419bb4953ce2c87 (diff) | |
| parent | 66dcad3a9a53e0766d90e0084123bd8529522fb0 (diff) | |
| download | olio-uboot-2014.01-6b6f287a33ae8c340f97fb08ed95b6687e2baa4b.tar.xz olio-uboot-2014.01-6b6f287a33ae8c340f97fb08ed95b6687e2baa4b.zip | |
Merge ../u-boot
Diffstat (limited to 'board/stxssa/stxssa.c')
| -rw-r--r-- | board/stxssa/stxssa.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c index 588212415..9bacb98d8 100644 --- 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 */ } |