lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] Compilation fixes for ppc4xx PCI-less configs

Browse Source 
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@toxygen.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Wojtek Kaniewski
2006-11-08 19:52:57 -08:00
committed by Paul Mackerras
parent d6a0005c26
commit 1d30593e4c
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ppc/platforms/4xx/bubinga.c
View File

@@ -116,6 +116,7 @@ bubinga_early_serial_map(void)
void __init void __init
bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
{ {
#ifdef CONFIG_PCI
unsigned int bar_response, bar; unsigned int bar_response, bar;
/* /*
@@ -211,6 +212,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
printk(" ptm2ms\t0x%x\n", in_le32(&(pcip->ptm2ms))); printk(" ptm2ms\t0x%x\n", in_le32(&(pcip->ptm2ms)));
printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la))); printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la)));
#endif
#endif #endif
} }

2
arch/ppc/platforms/4xx/cpci405.c
View File

@@ -126,6 +126,7 @@ cpci405_setup_arch(void)
void __init void __init
bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
{ {
#ifdef CONFIG_PCI
unsigned int bar_response, bar; unsigned int bar_response, bar;
/* Disable region first */ /* Disable region first */
@@ -167,6 +168,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
PCI_FUNC(hose->first_busno), bar, PCI_FUNC(hose->first_busno), bar,
&bar_response); &bar_response);
} }
#endif
} }
void __init void __init

2
arch/ppc/platforms/4xx/ep405.c
View File

@@ -68,6 +68,7 @@ ep405_setup_arch(void)
void __init void __init
bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
{ {
#ifdef CONFIG_PCI
unsigned int bar_response, bar; unsigned int bar_response, bar;
/* /*
* Expected PCI mapping: * Expected PCI mapping:
@@ -130,6 +131,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
PCI_FUNC(hose->first_busno), bar, bar_response); PCI_FUNC(hose->first_busno), bar, bar_response);
} }
/* end work arround */ /* end work arround */
#endif
} }
void __init void __init