diff options
author | Wojtek Kaniewski <wojtekka@toxygen.net> | 2006-11-08 22:52:57 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 04:39:24 -0500 |
commit | 1d30593e4c406c753e395676ba8b58600ccccbc1 (patch) | |
tree | b30f35675240cfe4a8ef758554d8eac5602bfc18 /arch/ppc/platforms | |
parent | d6a0005c26aea9d470cf80c392d3bf2039dc4679 (diff) |
[POWERPC] Compilation fixes for ppc4xx PCI-less configs
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>
Diffstat (limited to 'arch/ppc/platforms')
-rw-r--r-- | arch/ppc/platforms/4xx/bubinga.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/cpci405.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/ep405.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/ppc/platforms/4xx/bubinga.c b/arch/ppc/platforms/4xx/bubinga.c index 4009f4983ca6..75857b38e894 100644 --- a/arch/ppc/platforms/4xx/bubinga.c +++ b/arch/ppc/platforms/4xx/bubinga.c | |||
@@ -116,6 +116,7 @@ bubinga_early_serial_map(void) | |||
116 | void __init | 116 | void __init |
117 | bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) | 117 | bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) |
118 | { | 118 | { |
119 | #ifdef CONFIG_PCI | ||
119 | 120 | ||
120 | unsigned int bar_response, bar; | 121 | unsigned int bar_response, bar; |
121 | /* | 122 | /* |
@@ -212,6 +213,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) | |||
212 | printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la))); | 213 | printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la))); |
213 | 214 | ||
214 | #endif | 215 | #endif |
216 | #endif | ||
215 | } | 217 | } |
216 | 218 | ||
217 | void __init | 219 | void __init |
diff --git a/arch/ppc/platforms/4xx/cpci405.c b/arch/ppc/platforms/4xx/cpci405.c index 367430998fc5..8474b05b795a 100644 --- a/arch/ppc/platforms/4xx/cpci405.c +++ b/arch/ppc/platforms/4xx/cpci405.c | |||
@@ -126,6 +126,7 @@ cpci405_setup_arch(void) | |||
126 | void __init | 126 | void __init |
127 | bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) | 127 | bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) |
128 | { | 128 | { |
129 | #ifdef CONFIG_PCI | ||
129 | unsigned int bar_response, bar; | 130 | unsigned int bar_response, bar; |
130 | 131 | ||
131 | /* Disable region first */ | 132 | /* Disable region first */ |
@@ -167,6 +168,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) | |||
167 | PCI_FUNC(hose->first_busno), bar, | 168 | PCI_FUNC(hose->first_busno), bar, |
168 | &bar_response); | 169 | &bar_response); |
169 | } | 170 | } |
171 | #endif | ||
170 | } | 172 | } |
171 | 173 | ||
172 | void __init | 174 | void __init |
diff --git a/arch/ppc/platforms/4xx/ep405.c b/arch/ppc/platforms/4xx/ep405.c index ae5c82081c95..e5adf9ba1fca 100644 --- a/arch/ppc/platforms/4xx/ep405.c +++ b/arch/ppc/platforms/4xx/ep405.c | |||
@@ -68,6 +68,7 @@ ep405_setup_arch(void) | |||
68 | void __init | 68 | void __init |
69 | bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) | 69 | bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) |
70 | { | 70 | { |
71 | #ifdef CONFIG_PCI | ||
71 | unsigned int bar_response, bar; | 72 | unsigned int bar_response, bar; |
72 | /* | 73 | /* |
73 | * Expected PCI mapping: | 74 | * Expected PCI mapping: |
@@ -130,6 +131,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) | |||
130 | PCI_FUNC(hose->first_busno), bar, bar_response); | 131 | PCI_FUNC(hose->first_busno), bar, bar_response); |
131 | } | 132 | } |
132 | /* end work arround */ | 133 | /* end work arround */ |
134 | #endif | ||
133 | } | 135 | } |
134 | 136 | ||
135 | void __init | 137 | void __init |