Message ID | 1350330741-11390-2-git-send-email-timur@freescale.com (mailing list archive) |
---|---|
State | Accepted, archived |
Delegated to: | Kumar Gala |
Headers | show |
On Oct 15, 2012, at 2:52 PM, Timur Tabi wrote: > Function fsl_pcibios_fixup_bus() is available only if PCI is enabled. The > MPC8610 HPCD platform file was not protecting the assigned with an #ifdef, > which results in a link failure when PCI is disabled. Every other platform > already has this #ifdef. > > Signed-off-by: Timur Tabi <timur@freescale.com> > --- > arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) applied to next - k
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c index a817398..04d9d31 100644 --- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c +++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c @@ -353,5 +353,7 @@ define_machine(mpc86xx_hpcd) { .time_init = mpc86xx_time_init, .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, +#ifdef CONFIG_PCI .pcibios_fixup_bus = fsl_pcibios_fixup_bus, +#endif };
Function fsl_pcibios_fixup_bus() is available only if PCI is enabled. The MPC8610 HPCD platform file was not protecting the assigned with an #ifdef, which results in a link failure when PCI is disabled. Every other platform already has this #ifdef. Signed-off-by: Timur Tabi <timur@freescale.com> --- arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)