patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / ppc / platforms / 4xx / ash.c

diff --git a/arch/ppc/platforms/4xx/ash.c b/arch/ppc/platforms/4xx/ash.c
index e0a00fd..ce29117 100644 (file)
--- a/arch/ppc/platforms/4xx/ash.c
+++ b/arch/ppc/platforms/4xx/ash.c
@@ -18,6 +18,8 @@
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
 #include <asm/io.h>
+#include <asm/ocp.h>
+#include <asm/ibm_ocp_pci.h>
 #include <asm/todc.h>
 
 #ifdef DEBUG
@@ -53,10 +55,10 @@ ppc405_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
 void __init
 ash_setup_arch(void)
 {
-       bd_t *bip = &__res;
-
        ppc4xx_setup_arch();
 
+       ibm_ocp_set_emac(0, 3);
+
 #ifdef CONFIG_DEBUG_BRINGUP
        int i;
        printk("\n");
@@ -96,8 +98,6 @@ ash_setup_arch(void)
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
-
-       unsigned int bar_response, bar;
        /*
         * Expected PCI mapping:
         *