|
@@ -1,5 +1,5 @@
|
|
|
/*
|
|
|
- * Copyright 2007,2009-2010 Freescale Semiconductor, Inc.
|
|
|
+ * Copyright 2007,2009-2011 Freescale Semiconductor, Inc.
|
|
|
*
|
|
|
* See file CREDITS for list of people who contributed to this
|
|
|
* project.
|
|
@@ -227,11 +227,7 @@ static struct pci_config_table pci_fsl86xxads_config_table[] = {
|
|
|
#endif
|
|
|
|
|
|
|
|
|
-static struct pci_controller pci1_hose = {
|
|
|
-#ifndef CONFIG_PCI_PNP
|
|
|
-config_table:pci_mpc86xxcts_config_table
|
|
|
-#endif
|
|
|
-};
|
|
|
+static struct pci_controller pci1_hose;
|
|
|
#endif /* CONFIG_PCI */
|
|
|
|
|
|
void pci_init_board(void)
|
|
@@ -261,6 +257,9 @@ void pci_init_board(void)
|
|
|
" (base address %lx)\n",
|
|
|
pci_agent ? "Agent" : "Host",
|
|
|
pci_info.regs);
|
|
|
+#ifndef CONFIG_PCI_PNP
|
|
|
+ pci1_hose.config_table = pci_mpc86xxcts_config_table;
|
|
|
+#endif
|
|
|
first_free_busno = fsl_pci_init_port(&pci_info,
|
|
|
&pci1_hose, first_free_busno);
|
|
|
} else {
|