powerpc/86xx: fsl_pcibios_fixup_bus requires CONFIG_PCI
authorTimur Tabi <timur@freescale.com>
Mon, 15 Oct 2012 19:52:21 +0000 (14:52 -0500)
committerKumar Gala <galak@kernel.crashing.org>
Sun, 25 Nov 2012 13:00:24 +0000 (07:00 -0600)
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>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/platforms/86xx/mpc8610_hpcd.c

index a817398a56da7c6b86c5a070cd58819b42bcdd63..04d9d317f741b4f30d27bba8aeb52fc7afb72e0e 100644 (file)
@@ -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
 };