aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-09-10 15:30:33 -0400
committerKumar Gala <galak@kernel.crashing.org>2007-09-10 17:00:09 -0400
commit2af8569dc9f29c303bf4aa012d991afcfaeed0c3 (patch)
treec54f51494c7df7023ab66ed25c92d07b20e9e02e
parentb21010ed6498391c0f359f2a89c907533fe07fec (diff)
[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: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--arch/powerpc/platforms/85xx/mpc8544_ds.c2
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_cds.c2
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_mds.c2
-rw-r--r--arch/powerpc/platforms/86xx/mpc86xx_hpcn.c2
4 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc8544_ds.c b/arch/powerpc/platforms/85xx/mpc8544_ds.c
index 0f834d8be444..48983bc56d46 100644
--- a/arch/powerpc/platforms/85xx/mpc8544_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc8544_ds.c
@@ -178,7 +178,9 @@ define_machine(mpc8544_ds) {
178 .probe = mpc8544_ds_probe, 178 .probe = mpc8544_ds_probe,
179 .setup_arch = mpc8544_ds_setup_arch, 179 .setup_arch = mpc8544_ds_setup_arch,
180 .init_IRQ = mpc8544_ds_pic_init, 180 .init_IRQ = mpc8544_ds_pic_init,
181#ifdef CONFIG_PCI
181 .pcibios_fixup_bus = fsl_pcibios_fixup_bus, 182 .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
183#endif
182 .get_irq = mpic_get_irq, 184 .get_irq = mpic_get_irq,
183 .restart = mpc85xx_restart, 185 .restart = mpc85xx_restart,
184 .calibrate_decr = generic_calibrate_decr, 186 .calibrate_decr = generic_calibrate_decr,
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 6a171e9abf7d..2d4cb7847604 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -351,10 +351,10 @@ define_machine(mpc85xx_cds) {
351 .get_irq = mpic_get_irq, 351 .get_irq = mpic_get_irq,
352#ifdef CONFIG_PCI 352#ifdef CONFIG_PCI
353 .restart = mpc85xx_cds_restart, 353 .restart = mpc85xx_cds_restart,
354 .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
354#else 355#else
355 .restart = mpc85xx_restart, 356 .restart = mpc85xx_restart,
356#endif 357#endif
357 .calibrate_decr = generic_calibrate_decr, 358 .calibrate_decr = generic_calibrate_decr,
358 .progress = udbg_progress, 359 .progress = udbg_progress,
359 .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
360}; 360};
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index be25ecd911ba..7ca7e676f1c4 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -207,5 +207,7 @@ define_machine(mpc85xx_mds) {
207 .restart = mpc85xx_restart, 207 .restart = mpc85xx_restart,
208 .calibrate_decr = generic_calibrate_decr, 208 .calibrate_decr = generic_calibrate_decr,
209 .progress = udbg_progress, 209 .progress = udbg_progress,
210#ifdef CONFIG_PCI
210 .pcibios_fixup_bus = fsl_pcibios_fixup_bus, 211 .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
212#endif
211}; 213};
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 56b27caf7a27..47aafa76c933 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -250,5 +250,7 @@ define_machine(mpc86xx_hpcn) {
250 .time_init = mpc86xx_time_init, 250 .time_init = mpc86xx_time_init,
251 .calibrate_decr = generic_calibrate_decr, 251 .calibrate_decr = generic_calibrate_decr,
252 .progress = udbg_progress, 252 .progress = udbg_progress,
253#ifdef CONFIG_PCI
253 .pcibios_fixup_bus = fsl_pcibios_fixup_bus, 254 .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
255#endif
254}; 256};