From b092072e4780c1b1aaf5579e7bf887ebf0ccbdc0 Mon Sep 17 00:00:00 2001 From: Zhao Chenhui Date: Wed, 24 Aug 2011 13:20:05 +0800 Subject: powerpc/mpc8568mds: 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 Signed-off-by: Kumar Gala --- board/freescale/mpc8568mds/mpc8568mds.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'board/freescale/mpc8568mds') diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index 5cda81c318..225c5d8d07 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/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 * @@ -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 { -- cgit v1.2.3