[PATCH] ppc4xx: Compilation fixes for PCI-less configs

[Wojtek Kaniewski]

Fix compilation without PCI support for Bubinga, CPCI405 and EP405.
bios_fixup() for these boards uses functions available only with
CONFIG_PCI, so linker fails.

Signed-Off-By: Wojtek Kaniewski <wojtekka@xxxxxxxxxxx>

--- linux-2.6.19-rc3.orig/arch/ppc/platforms/4xx/bubinga.c	2006-10-25 22:29:35.000000000 +0200
+++ linux-2.6.19-rc3/arch/ppc/platforms/4xx/bubinga.c	2006-10-25 23:12:09.000000000 +0200
@@ -116,6 +116,7 @@
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
+#ifdef CONFIG_PCI

 	unsigned int bar_response, bar;
 	/*
@@ -212,6 +213,7 @@
 	printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la)));

 #endif
+#endif
 }

 void __init
--- linux-2.6.19-rc3.orig/arch/ppc/platforms/4xx/cpci405.c	2006-10-25 22:29:35.000000000 +0200
+++ linux-2.6.19-rc3/arch/ppc/platforms/4xx/cpci405.c	2006-10-25 22:54:55.000000000 +0200
@@ -126,6 +126,7 @@
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
+#ifdef CONFIG_PCI
 	unsigned int bar_response, bar;

 	/* Disable region first */
@@ -167,6 +168,7 @@
 					PCI_FUNC(hose->first_busno), bar,
 					&bar_response);
 	}
+#endif
 }

 void __init
--- linux-2.6.19-rc3.orig/arch/ppc/platforms/4xx/ep405.c	2006-10-25 22:29:35.000000000 +0200
+++ linux-2.6.19-rc3/arch/ppc/platforms/4xx/ep405.c	2006-10-25 23:01:20.000000000 +0200
@@ -68,6 +68,7 @@
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
+#ifdef CONFIG_PCI
 	unsigned int bar_response, bar;
 	/*
 	 * Expected PCI mapping:
@@ -130,6 +131,7 @@
 		    PCI_FUNC(hose->first_busno), bar, bar_response);
 	}
 	/* end work arround */
+#endif
 }

 void __init
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/