1 files changed, 8 insertions, 20 deletions

diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index b46c5d8a77bd..185f98e3964c 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -54,13 +54,16 @@
 #include <linux/delay.h>
 #include <linux/crc32.h>
 #include <linux/phy.h>
+
+#include <asm/cpu.h>
 #include <asm/mipsregs.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 
-#include <asm/mach-au1x00/au1000.h>
-#include <asm/cpu.h>
+#include <au1000.h>
+#include <prom.h>
+
 #include "au1000_eth.h"
 
 #ifdef AU1000_ETH_DEBUG
@@ -96,11 +99,6 @@ static void mdio_write(struct net_device *, int, int, u16);
 static void au1000_adjust_link(struct net_device *);
 static void enable_mac(struct net_device *, int);
 
-// externs
-extern int get_ethernet_addr(char *ethernet_addr);
-extern void str2eaddr(unsigned char *ea, unsigned char *str);
-extern char * prom_getcmdline(void);
-
 /*
  * Theory of operation
  *
@@ -619,7 +617,6 @@ static struct net_device * au1000_probe(int port_num)
         struct au1000_private *aup = NULL;
         struct net_device *dev = NULL;
         db_dest_t *pDB, *pDBfree;
-        char *pmac, *argptr;
         char ethaddr[6];
         int irq, i, err;
         u32 base, macen;
@@ -677,21 +674,12 @@ static struct net_device * au1000_probe(int port_num)
         au_macs[port_num] = aup;
 
         if (port_num == 0) {
-                /* Check the environment variables first */
-                if (get_ethernet_addr(ethaddr) == 0)
+                if (prom_get_ethernet_addr(ethaddr) == 0)
                         memcpy(au1000_mac_addr, ethaddr, sizeof(au1000_mac_addr));
                 else {
-                        /* Check command line */
-                        argptr = prom_getcmdline();
-                        if ((pmac = strstr(argptr, "ethaddr=")) == NULL)
-                                printk(KERN_INFO "%s: No MAC address found\n",
-                                                 dev->name);
+                        printk(KERN_INFO "%s: No MAC address found\n",
+                                         dev->name);
                                 /* Use the hard coded MAC addresses */
-                        else {
-                                str2eaddr(ethaddr, pmac + strlen("ethaddr="));
-                                memcpy(au1000_mac_addr, ethaddr,
-                                       sizeof(au1000_mac_addr));
-                        }
                 }
 
                 setup_hw_rings(aup, MAC0_RX_DMA_ADDR, MAC0_TX_DMA_ADDR);