[patch 2/3] ppc4xx: Compilation fixes for PCI-less configs
DORMANTno replies
From: <hidden>
Date: 2006-11-09 03:53:03
From: Wojtek Kaniewski <redacted> 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 <redacted> Cc: Paul Mackerras <redacted> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: <redacted> Signed-off-by: Andrew Morton <redacted> --- arch/ppc/platforms/4xx/bubinga.c | 2 ++ arch/ppc/platforms/4xx/cpci405.c | 2 ++ arch/ppc/platforms/4xx/ep405.c | 2 ++ 3 files changed, 6 insertions(+) diff -puN arch/ppc/platforms/4xx/bubinga.c~ppc4xx-compilation-fixes-for-pci-less-configs arch/ppc/platforms/4xx/bubinga.c
--- a/arch/ppc/platforms/4xx/bubinga.c~ppc4xx-compilation-fixes-for-pci-less-configs
+++ a/arch/ppc/platforms/4xx/bubinga.c@@ -116,6 +116,7 @@ bubinga_early_serial_map(void) void __init bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) { +#ifdef CONFIG_PCI unsigned int bar_response, bar; /*
@@ -212,6 +213,7 @@ bios_fixup(struct pci_controller *hose, printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la))); #endif +#endif } void __init
diff -puN arch/ppc/platforms/4xx/cpci405.c~ppc4xx-compilation-fixes-for-pci-less-configs arch/ppc/platforms/4xx/cpci405.c
--- a/arch/ppc/platforms/4xx/cpci405.c~ppc4xx-compilation-fixes-for-pci-less-configs
+++ a/arch/ppc/platforms/4xx/cpci405.c@@ -126,6 +126,7 @@ cpci405_setup_arch(void) 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 @@ bios_fixup(struct pci_controller *hose, PCI_FUNC(hose->first_busno), bar, &bar_response); } +#endif } void __init
diff -puN arch/ppc/platforms/4xx/ep405.c~ppc4xx-compilation-fixes-for-pci-less-configs arch/ppc/platforms/4xx/ep405.c
--- a/arch/ppc/platforms/4xx/ep405.c~ppc4xx-compilation-fixes-for-pci-less-configs
+++ a/arch/ppc/platforms/4xx/ep405.c@@ -68,6 +68,7 @@ ep405_setup_arch(void) 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 @@ bios_fixup(struct pci_controller *hose, PCI_FUNC(hose->first_busno), bar, bar_response); } /* end work arround */ +#endif } void __init
_