projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
[oweals/u-boot.git]
/
drivers
/
net
/
plb2800_eth.c
diff --git
a/drivers/net/plb2800_eth.c
b/drivers/net/plb2800_eth.c
index b8cc57aa78b3226a057e405c5eadd22d465c1af6..dad842c728dc03075e03fbe2ddd7231ced4b108f 100644
(file)
--- a/
drivers/net/plb2800_eth.c
+++ b/
drivers/net/plb2800_eth.c
@@
-24,10
+24,6
@@
*/
#include <common.h>
-
-#if defined(CONFIG_CMD_NET) \
- && defined(CONFIG_NET_MULTI) && defined(CONFIG_PLB2800_ETHER)
-
#include <malloc.h>
#include <net.h>
#include <asm/addrspace.h>
@@
-392,5
+388,3
@@
static unsigned char * plb2800_get_mac_addr(void)
return addr;
}
-
-#endif /* CONFIG_PLB2800_ETHER */