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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
4xx
/
ep405.c
diff --git
a/arch/ppc/platforms/4xx/ep405.c
b/arch/ppc/platforms/4xx/ep405.c
index
26a07cd
..
e5adf9b
100644
(file)
--- a/
arch/ppc/platforms/4xx/ep405.c
+++ b/
arch/ppc/platforms/4xx/ep405.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/4xx/ep405.c
- *
* Embedded Planet 405GP board
* http://www.embeddedplanet.com
*
* Embedded Planet 405GP board
* http://www.embeddedplanet.com
*
@@
-11,7
+9,6
@@
* is licensed "as is" without any warranty of any kind, whether express
* or implied.
*/
* is licensed "as is" without any warranty of any kind, whether express
* or implied.
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <asm/system.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <asm/system.h>
@@
-71,6
+68,7
@@
ep405_setup_arch(void)
void __init
bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
{
void __init
bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
{
+#ifdef CONFIG_PCI
unsigned int bar_response, bar;
/*
* Expected PCI mapping:
unsigned int bar_response, bar;
/*
* Expected PCI mapping:
@@
-133,6
+131,7
@@
bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
PCI_FUNC(hose->first_busno), bar, bar_response);
}
/* end work arround */
PCI_FUNC(hose->first_busno), bar, bar_response);
}
/* end work arround */
+#endif
}
void __init
}
void __init