[PATCH] ppc32: Fix building MPC8555 CDS when CONFIG_PCI is disabled

From: Kumar Gala
Date: Wed May 25 2005 - 10:39:01 EST


The patch that introduced support for the VIA chipset broke building if
CONFIG_PCI is disabled.

Signed-off-by: Kumar Gala <kumar.gala@xxxxxxxxxxxxx>

---
commit 84a069e46b6b866b338e44529f505fddd7d31fbb
tree 362fd343e5b2c022b654da36742ce08b6a5ddca9
parent 7289356a6b3c0218f9ad6e85280c4f9cc121e371
author Kumar K. Gala <kumar.gala@xxxxxxxxxxxxx> Wed, 25 May 2005 10:32:53 -0500
committer Kumar K. Gala <kumar.gala@xxxxxxxxxxxxx> Wed, 25 May 2005 10:32:53 -0500

ppc/platforms/85xx/mpc85xx_cds_common.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

Index: arch/ppc/platforms/85xx/mpc85xx_cds_common.c
===================================================================
--- 12a426fa6a66d581ca2c5fca42457b3f3505af09/arch/ppc/platforms/85xx/mpc85xx_cds_common.c (mode:100644)
+++ 362fd343e5b2c022b654da36742ce08b6a5ddca9/arch/ppc/platforms/85xx/mpc85xx_cds_common.c (mode:100644)
@@ -439,9 +439,6 @@

printk("mpc85xx_cds_setup_arch\n");

- /* VIA IDE configuration */
- ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
-
#ifdef CONFIG_CPM2
cpm2_reset();
#endif
@@ -462,6 +459,9 @@
loops_per_jiffy = freq / HZ;

#ifdef CONFIG_PCI
+ /* VIA IDE configuration */
+ ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
+
/* setup PCI host bridges */
mpc85xx_setup_hose();
#endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/