Commit 91f9855a authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds

[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: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a6dbba77
...@@ -439,9 +439,6 @@ mpc85xx_cds_setup_arch(void) ...@@ -439,9 +439,6 @@ mpc85xx_cds_setup_arch(void)
printk("mpc85xx_cds_setup_arch\n"); printk("mpc85xx_cds_setup_arch\n");
/* VIA IDE configuration */
ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
#ifdef CONFIG_CPM2 #ifdef CONFIG_CPM2
cpm2_reset(); cpm2_reset();
#endif #endif
...@@ -462,6 +459,9 @@ mpc85xx_cds_setup_arch(void) ...@@ -462,6 +459,9 @@ mpc85xx_cds_setup_arch(void)
loops_per_jiffy = freq / HZ; loops_per_jiffy = freq / HZ;
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
/* VIA IDE configuration */
ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
/* setup PCI host bridges */ /* setup PCI host bridges */
mpc85xx_setup_hose(); mpc85xx_setup_hose();
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment