diff options
| author | Timur Tabi <timur@freescale.com> | 2012-10-15 21:52:21 +0200 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2012-11-25 14:00:24 +0100 |
| commit | b567d1c74ecfe4c321bdba251506a95e4c837c86 (patch) | |
| tree | 7fe016ce1dfa85a206c0dc41363c7878dac13fac /arch/powerpc | |
| parent | drivers/virt: the Freescale hypervisor driver doesn't need to check MSR[GS] (diff) | |
| download | linux-b567d1c74ecfe4c321bdba251506a95e4c837c86.tar.xz linux-b567d1c74ecfe4c321bdba251506a95e4c837c86.zip | |
powerpc/86xx: fsl_pcibios_fixup_bus requires CONFIG_PCI
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>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c index a817398a56da..04d9d317f741 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 }; |