From c569c3350a7ddb6466dbf5fea53eef0c9fd29edc Mon Sep 17 00:00:00 2001
From: Timur Tabi <timur@freescale.com>
Date: Mon, 15 Oct 2012 14:52:21 -0500
Subject: [PATCH] --- yaml --- r: 346827 b: refs/heads/master c:
 b567d1c74ecfe4c321bdba251506a95e4c837c86 h: refs/heads/master i:   346825:
 75ade6c24ac218cfab0109ea62b6177c4169aa62   346823:
 6869e44f5c26c24ee581bae2d11c465a7d09f449 v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4813f51c938c..55dca2f02de7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9655aa6b8034ebb69724dc4b54ad4f64a53096d1
+refs/heads/master: b567d1c74ecfe4c321bdba251506a95e4c837c86
diff --git a/trunk/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/trunk/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index a817398a56da..04d9d317f741 100644
--- a/trunk/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/trunk/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
 };