projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qe: move drivers/qe/qe.h to include/fsl_qe.h
[oweals/u-boot.git]
/
drivers
/
net
/
lan91c96.c
diff --git
a/drivers/net/lan91c96.c
b/drivers/net/lan91c96.c
index 495c0886faea75df712643f27e89a9f5c35dc2ec..3526876d1419cfb2bd2660f190306d90aa0798bf 100644
(file)
--- a/
drivers/net/lan91c96.c
+++ b/
drivers/net/lan91c96.c
@@
-1,7
+1,7
@@
/*------------------------------------------------------------------------
* lan91c96.c
* This is a driver for SMSC's LAN91C96 single-chip Ethernet device, based
/*------------------------------------------------------------------------
* lan91c96.c
* This is a driver for SMSC's LAN91C96 single-chip Ethernet device, based
- * on the SMC91111 driver from U-
b
oot.
+ * on the SMC91111 driver from U-
B
oot.
*
* (C) Copyright 2002
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
*
* (C) Copyright 2002
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
@@
-725,12
+725,6
@@
static int smc_get_ethaddr(bd_t *bd, struct eth_device *dev)
static int get_rom_mac(struct eth_device *dev, unsigned char *v_rom_mac)
{
static int get_rom_mac(struct eth_device *dev, unsigned char *v_rom_mac)
{
-#ifdef HARDCODE_MAC /* used for testing or to supress run time warnings */
- char hw_mac_addr[] = { 0x02, 0x80, 0xad, 0x20, 0x31, 0xb8 };
-
- memcpy (v_rom_mac, hw_mac_addr, 6);
- return (1);
-#else
int i;
SMC_SELECT_BANK(dev, 1);
for (i=0; i<6; i++)
int i;
SMC_SELECT_BANK(dev, 1);
for (i=0; i<6; i++)
@@
-738,7
+732,6
@@
static int get_rom_mac(struct eth_device *dev, unsigned char *v_rom_mac)
v_rom_mac[i] = SMC_inb(dev, LAN91C96_IA0 + i);
}
return (1);
v_rom_mac[i] = SMC_inb(dev, LAN91C96_IA0 + i);
}
return (1);
-#endif
}
/* Structure to detect the device IDs */
}
/* Structure to detect the device IDs */