fedora core 6 1.2949 + vserver 2.2.0

[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..f414d2d 100644 (file)
--- a/arch/ppc/platforms/4xx/walnut.c
+++ b/arch/ppc/platforms/4xx/walnut.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/walnut.c
- *
  * Architecture- / platform-specific boot-time initialization code for
  * IBM PowerPC 4xx based boards. Adapted from original
  * code by Gary Thomas, Cort Dougan <cort@fsmlabs.com>, and Dan Malek
@@ -13,7 +11,6 @@
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  */
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/smp.h>
 #include <linux/threads.h>
@@ -28,6 +25,7 @@
 #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>
 
@@ -78,6 +76,8 @@ walnut_setup_arch(void)
 
        ppc4xx_setup_arch();
 
+       ibm_ocp_set_emac(0, 0);
+
        kb_data = ioremap(WALNUT_PS2_BASE, 8);
        if (!kb_data) {
                printk(KERN_CRIT
@@ -87,7 +87,7 @@ walnut_setup_arch(void)
 
        kb_cs = kb_data + 1;
 
-       fpga_status = ioremap(WALNUT_FPGA_BASE, 8);
+       fpga_status = ioremap(PPC40x_FPGA_BASE, 8);
        if (!fpga_status) {
                printk(KERN_CRIT
                       "walnut_setup_arch() fpga_status ioremap failed\n");