From: Zhao Chenhui <chenhui.zhao@freescale.com>
Date: Wed, 24 Aug 2011 05:20:06 +0000 (+0800)
Subject: powerpc/mpc8610hpcd: set pci1_hose.config_table after fsl_setup_hose
X-Git-Tag: v2011.09-rc1~12^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d5c784ed537fa774deefa76ebe3b726728d144e1;p=oweals%2Fu-boot.git

powerpc/mpc8610hpcd: set pci1_hose.config_table after fsl_setup_hose

The function fsl_setup_hose clears the variable pci1_hose.
Set pci1_hose.config_table after it.

Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---

diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 8aceddbf07..1854e27dac 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/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 {