]> err.no Git - linux-2.6/commitdiff
[POWERPC] 8{5,6}xx: Fix build issue with !CONFIG_PCI
authorKumar Gala <galak@kernel.crashing.org>
Mon, 10 Sep 2007 19:30:33 +0000 (14:30 -0500)
committerKumar Gala <galak@kernel.crashing.org>
Mon, 10 Sep 2007 21:00:09 +0000 (16:00 -0500)
We needed some ifdef CONFIG_PCI protection for pcibios_fixup so we
can build !CONFIG_PCI.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/platforms/85xx/mpc8544_ds.c
arch/powerpc/platforms/85xx/mpc85xx_cds.c
arch/powerpc/platforms/85xx/mpc85xx_mds.c
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c

index 0f834d8be44478e52a333039b2b8373bee7fdba2..48983bc56d4639995aca52fb536da71fd3a3a411 100644 (file)
@@ -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,
index 6a171e9abf7deef57664c0e338292cfb9432af3b..2d4cb784760423931e5150cb87f2a567f657c8ec 100644 (file)
@@ -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,
 };
index be25ecd911ba05263060d86c7751822c6d8bbf4e..7ca7e676f1c42cd849c9f25709f3326124038851 100644 (file)
@@ -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
 };
index 56b27caf7a27b7b050e144abff30b5ea8e2e819b..47aafa76c933c01a27d66f78559483c96446dbfb 100644 (file)
@@ -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
 };