2007-06-22 Joel Sherrill <joel.sherrill@OARcorp.com>

	* network/network.c: Remove cs8900_get_mac_addr which conflicted with
	one in libchip AND contained a hard-coded MAC address.

2 files changed, 5 insertions, 10 deletions

diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog
index a4d8ac8fc1..5216ba869a 100644
--- a/c/src/lib/libbsp/arm/edb7312/ChangeLog
+++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-22	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* network/network.c: Remove cs8900_get_mac_addr which conflicted with
+	one in libchip AND contained a hard-coded MAC address.
+
 2007-05-28	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/bspstart.c: Eliminate maximum_drivers configuration parameter
diff --git a/c/src/lib/libbsp/arm/edb7312/network/network.c b/c/src/lib/libbsp/arm/edb7312/network/network.c
index 07cd11935f..236176f171 100644
--- a/c/src/lib/libbsp/arm/edb7312/network/network.c
+++ b/c/src/lib/libbsp/arm/edb7312/network/network.c
@@ -67,16 +67,6 @@ unsigned short cs8900_mem_get_reg (cs8900_device *cs, unsigned long reg)
     return cs8900_io_get_reg(cs, CS8900_IO_PP_DATA_PORT0);
 }
 
-void cs8900_get_mac_addr (cs8900_device *cs, unsigned char *mac_address)
-{
-    mac_address[0] = 0x08;
-    mac_address[1] = 0x00;
-    mac_address[2] = 0x3e;
-    mac_address[3] = 0x21;
-    mac_address[4] = 0xc7;
-    mac_address[5] = 0xf7;
-}
-
 void cs8900_attach_interrupt (cs8900_device *cs)
 {
     g_cs = cs;