[PATCH] ppc32: Fix building MPC8555 CDS when CONFIG_PCI is disabled
authorKumar Gala <galak@freescale.com>
Sat, 28 May 2005 22:52:12 +0000 (15:52 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 28 May 2005 23:46:16 +0000 (16:46 -0700)
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>
arch/ppc/platforms/85xx/mpc85xx_cds_common.c

index c2a5127..3ac0321 100644 (file)
@@ -439,9 +439,6 @@ mpc85xx_cds_setup_arch(void)
 
        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 @@ mpc85xx_cds_setup_arch(void)
        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