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 commit 'wd/master'
[oweals/u-boot.git]
/
drivers
/
net
/
inca-ip_sw.c
diff --git
a/drivers/net/inca-ip_sw.c
b/drivers/net/inca-ip_sw.c
index a079b600307e296ae5ae675495804d4548d33eb2..d852a150fa913a4dfb8c478f94ce500a6a0f386e 100644
(file)
--- a/
drivers/net/inca-ip_sw.c
+++ b/
drivers/net/inca-ip_sw.c
@@
-26,9
+26,6
@@
#include <common.h>
-#if defined(CONFIG_CMD_NET) \
- && defined(CONFIG_NET_MULTI) && defined(CONFIG_INCA_IP_SWITCH)
-
#include <malloc.h>
#include <net.h>
#include <asm/inca-ip.h>
@@
-813,5
+810,3
@@
Fail:
return -1;
}
#endif /* CONFIG_INCA_IP_SWITCH_AMDIX */
-
-#endif