diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-09-15 00:01:53 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-09-15 00:01:53 +0200 |
| commit | 329ff3c93862bbee281cc601db786ce35026ca4a (patch) | |
| tree | 58d8a5198e09b2f9cd26eaca38cabc49d1db4dbe /board | |
| parent | d45963854eff39d575124d859419bb4953ce2c87 (diff) | |
| parent | 38ad82da0c1180ecdeb212a8f4245e945bcc546e (diff) | |
| download | u-boot-imx-329ff3c93862bbee281cc601db786ce35026ca4a.zip u-boot-imx-329ff3c93862bbee281cc601db786ce35026ca4a.tar.gz u-boot-imx-329ff3c93862bbee281cc601db786ce35026ca4a.tar.bz2 | |
Merge ../u-boot
Diffstat (limited to 'board')
| -rw-r--r-- | board/stxssa/stxssa.c | 9 |
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 */ } |