git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
4xx
/
cpci405.c
diff --git
a/arch/ppc/platforms/4xx/cpci405.c
b/arch/ppc/platforms/4xx/cpci405.c
index
3674309
..
8474b05
100644
(file)
--- a/
arch/ppc/platforms/4xx/cpci405.c
+++ b/
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, struct pcil0_regs *pcip)
PCI_FUNC(hose->first_busno), bar,
&bar_response);
}
+#endif
}
void __init