Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  powerpc/mpc8610hpcd: set pci1_hose.config_table after fsl_setup_hose
  powerpc/mpc8548cds: set pci1_hose.config_table after fsl_setup_hose
  powerpc/mpc8568mds: set pci1_hose.config_table after fsl_setup_hose

board/freescale/mpc8548cds/mpc8548cds.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004, 2007, 2009-2010 Freescale Semiconductor, Inc.
+ * Copyright 2004, 2007, 2009-2011 Freescale Semiconductor, Inc.
  *
  * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
  *
@@ -207,8 +207,7 @@ static struct pci_config_table pci_mpc85xxcds_config_table[] = {
 	{},
 };
 
-static struct pci_controller pci1_hose = {
-	config_table: pci_mpc85xxcds_config_table};
+static struct pci_controller pci1_hose;
 #endif	/* CONFIG_PCI */
 
 #ifdef CONFIG_PCI2
@@ -253,6 +252,7 @@ void pci_init_board(void)
 			pci_arb ? "arbiter" : "external-arbiter",
 			pci_info.regs);
 
+		pci1_hose.config_table = pci_mpc85xxcds_config_table;
 		first_free_busno = fsl_pci_init_port(&pci_info,
 					&pci1_hose, first_free_busno);
 

board/freescale/mpc8568mds/mpc8568mds.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2007,2009-2010 Freescale Semiconductor, Inc.
+ * Copyright 2007,2009-2011 Freescale Semiconductor, Inc.
  *
  * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
  *
@@ -259,11 +259,7 @@ static struct pci_config_table pci_mpc8568mds_config_table[] = {
 };
 #endif
 
-static struct pci_controller pci1_hose = {
-#ifndef CONFIG_PCI_PNP
-	config_table: pci_mpc8568mds_config_table,
-#endif
-};
+static struct pci_controller pci1_hose;
 #endif	/* CONFIG_PCI */
 
 /*
@@ -347,6 +343,9 @@ void pci_init_board(void)
 			pci_arb ? "arbiter" : "external-arbiter",
 			pci_info.regs);
 
+#ifndef CONFIG_PCI_PNP
+		pci1_hose.config_table = pci_mpc8568mds_config_table;
+#endif
 		first_free_busno = fsl_pci_init_port(&pci_info,
 					&pci1_hose, first_free_busno);
 	} else {

board/freescale/mpc8610hpcd/mpc8610hpcd.c

@@ -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 {