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

Commit 2af8569d authored by Kumar Gala's avatar Kumar Gala
Browse files

[POWERPC] 8{5,6}xx: Fix build issue with !CONFIG_PCI 



We needed some ifdef CONFIG_PCI protection for pcibios_fixup so we
can build !CONFIG_PCI.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent b21010ed

arch/powerpc/platforms/85xx/mpc8544_ds.c

+2 −0
Original line number Diff line number Diff line
@@ -178,7 +178,9 @@ define_machine(mpc8544_ds) { 
	.probe			= mpc8544_ds_probe,

	.setup_arch		= mpc8544_ds_setup_arch,

	.init_IRQ		= mpc8544_ds_pic_init,

#ifdef CONFIG_PCI

	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,

#endif

	.get_irq		= mpic_get_irq,

	.restart		= mpc85xx_restart,

	.calibrate_decr		= generic_calibrate_decr,

arch/powerpc/platforms/85xx/mpc85xx_cds.c

+1 −1
Original line number Diff line number Diff line
@@ -351,10 +351,10 @@ define_machine(mpc85xx_cds) { 
	.get_irq	= mpic_get_irq,

#ifdef CONFIG_PCI

	.restart	= mpc85xx_cds_restart,

	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,

#else

	.restart	= mpc85xx_restart,

#endif

	.calibrate_decr = generic_calibrate_decr,

	.progress	= udbg_progress,

	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,

};

arch/powerpc/platforms/85xx/mpc85xx_mds.c

+2 −0
Original line number Diff line number Diff line
@@ -207,5 +207,7 @@ define_machine(mpc85xx_mds) { 
	.restart	= mpc85xx_restart,

	.calibrate_decr	= generic_calibrate_decr,

	.progress	= udbg_progress,

#ifdef CONFIG_PCI

	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,

#endif

};

arch/powerpc/platforms/86xx/mpc86xx_hpcn.c

+2 −0
Original line number Diff line number Diff line
@@ -250,5 +250,7 @@ define_machine(mpc86xx_hpcn) { 
	.time_init		= mpc86xx_time_init,

	.calibrate_decr		= generic_calibrate_decr,

	.progress		= udbg_progress,

#ifdef CONFIG_PCI

	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,

#endif

};