Merge with git://www.denx.de/git/u-boot.git
This commit is contained in:
@@ -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 */
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user