Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/ppc/platforms/85xx/mpc85xx_cds_common.c

+3 −3
Original line number Diff line number Diff line
@@ -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