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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
4ad4417
..
6571e39
100644
(file)
--- a/
arch/ppc/platforms/4xx/cpci405.c
+++ b/
arch/ppc/platforms/4xx/cpci405.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/cpci405.c
- *
* Board setup routines for the esd CPCI-405 cPCI Board.
*
* Author: Stefan Roese
* Board setup routines for the esd CPCI-405 cPCI Board.
*
* Author: Stefan Roese
@@
-22,6
+20,7
@@
#include <asm/pci-bridge.h>
#include <asm/machdep.h>
#include <asm/todc.h>
#include <asm/pci-bridge.h>
#include <asm/machdep.h>
#include <asm/todc.h>
+#include <asm/ocp.h>
void *cpci405_nvram;
void *cpci405_nvram;
@@
-53,6
+52,9
@@
void __init
cpci405_setup_arch(void)
{
ppc4xx_setup_arch();
cpci405_setup_arch(void)
{
ppc4xx_setup_arch();
+
+ ibm_ocp_set_emac(0, 0);
+
TODC_INIT(TODC_TYPE_MK48T35, cpci405_nvram, cpci405_nvram, cpci405_nvram, 8);
}
TODC_INIT(TODC_TYPE_MK48T35, cpci405_nvram, cpci405_nvram, cpci405_nvram, 8);
}