powerpc/mpc8568mds: set pci1_hose.config_table after fsl_setup_hose
authorZhao Chenhui <chenhui.zhao@freescale.com>
Wed, 24 Aug 2011 05:20:05 +0000 (13:20 +0800)
committerKumar Gala <galak@kernel.crashing.org>
Fri, 9 Sep 2011 13:58:10 +0000 (08:58 -0500)
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>
board/freescale/mpc8568mds/mpc8568mds.c

index 5cda81c318e00a82a2beb2c91c53bbbe5ee80399..225c5d8d07e21eb2503b4d6b81c0c67878bf2cae 100644 (file)
@@ -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 {