summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/86xx
diff options
context:
space:
mode:
authorKumar Gala2007-09-10 21:30:33 +0200
committerKumar Gala2007-09-10 23:00:09 +0200
commit2af8569dc9f29c303bf4aa012d991afcfaeed0c3 (patch)
treec54f51494c7df7023ab66ed25c92d07b20e9e02e /arch/powerpc/platforms/86xx
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadkernel-qcow2-linux-2af8569dc9f29c303bf4aa012d991afcfaeed0c3.tar.gz
kernel-qcow2-linux-2af8569dc9f29c303bf4aa012d991afcfaeed0c3.tar.xz
kernel-qcow2-linux-2af8569dc9f29c303bf4aa012d991afcfaeed0c3.zip
[POWERPC] 8{5,6}xx: Fix build issue with !CONFIG_PCI
We needed some ifdef CONFIG_PCI protection for pcibios_fixup so we can build !CONFIG_PCI. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/86xx')
-rw-r--r--arch/powerpc/platforms/86xx/mpc86xx_hpcn.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 56b27caf7a27..47aafa76c933 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -250,5 +250,7 @@ define_machine(mpc86xx_hpcn) {
.time_init = mpc86xx_time_init,
.calibrate_decr = generic_calibrate_decr,
.progress = udbg_progress,
+#ifdef CONFIG_PCI
.pcibios_fixup_bus = fsl_pcibios_fixup_bus,
+#endif
};