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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
4xx
/
walnut.c
diff --git
a/arch/ppc/platforms/4xx/walnut.c
b/arch/ppc/platforms/4xx/walnut.c
index
f0ac898
..
a33eda4
100644
(file)
--- a/
arch/ppc/platforms/4xx/walnut.c
+++ b/
arch/ppc/platforms/4xx/walnut.c
@@
-28,6
+28,7
@@
#include <asm/page.h>
#include <asm/time.h>
#include <asm/io.h>
#include <asm/page.h>
#include <asm/time.h>
#include <asm/io.h>
+#include <asm/ocp.h>
#include <asm/ibm_ocp_pci.h>
#include <asm/todc.h>
#include <asm/ibm_ocp_pci.h>
#include <asm/todc.h>
@@
-78,6
+79,8
@@
walnut_setup_arch(void)
ppc4xx_setup_arch();
ppc4xx_setup_arch();
+ ibm_ocp_set_emac(0, 0);
+
kb_data = ioremap(WALNUT_PS2_BASE, 8);
if (!kb_data) {
printk(KERN_CRIT
kb_data = ioremap(WALNUT_PS2_BASE, 8);
if (!kb_data) {
printk(KERN_CRIT