aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorKumar Gala <galak@freescale.com>2005-05-28 18:52:12 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-28 19:46:16 -0400
commit91f9855a7afbb160ba1709bf342858732138abad (patch)
tree4ba86cf1c44e95bc87621c15772c58b47aaf8087 /arch/ppc
parenta6dbba77a9d4b47c60d60c4f07fa79b3ca93a1d5 (diff)
[PATCH] ppc32: Fix building MPC8555 CDS when CONFIG_PCI is disabled
The patch that introduced support for the VIA chipset broke building if CONFIG_PCI is disabled. Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/platforms/85xx/mpc85xx_cds_common.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index c2a512735183..3ac0321eed03 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -439,9 +439,6 @@ mpc85xx_cds_setup_arch(void)
439 439
440 printk("mpc85xx_cds_setup_arch\n"); 440 printk("mpc85xx_cds_setup_arch\n");
441 441
442 /* VIA IDE configuration */
443 ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
444
445#ifdef CONFIG_CPM2 442#ifdef CONFIG_CPM2
446 cpm2_reset(); 443 cpm2_reset();
447#endif 444#endif
@@ -462,6 +459,9 @@ mpc85xx_cds_setup_arch(void)
462 loops_per_jiffy = freq / HZ; 459 loops_per_jiffy = freq / HZ;
463 460
464#ifdef CONFIG_PCI 461#ifdef CONFIG_PCI
462 /* VIA IDE configuration */
463 ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
464
465 /* setup PCI host bridges */ 465 /* setup PCI host bridges */
466 mpc85xx_setup_hose(); 466 mpc85xx_setup_hose();
467#endif 467#endif