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 git://git.denx.de/u-boot-rockchip
[oweals/u-boot.git]
/
api
/
api_net.c
diff --git
a/api/api_net.c
b/api/api_net.c
index 7b3805e8fdbec822a38739074d107857112d86ee..67c291682a655a4bc545a4cd86cf2b52eb29808d 100644
(file)
--- a/
api/api_net.c
+++ b/
api/api_net.c
@@
-25,7
+25,7
@@
DECLARE_GLOBAL_DATA_PTR;
#define errf(fmt, args...) do { printf("ERROR @ %s(): ", __func__); printf(fmt, ##args); } while (0)
#define errf(fmt, args...) do { printf("ERROR @ %s(): ", __func__); printf(fmt, ##args); } while (0)
-#if
def CONFIG_CMD_NET
+#if
defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)
static int dev_valid_net(void *cookie)
{
static int dev_valid_net(void *cookie)
{
@@
-37,7
+37,7
@@
int dev_open_net(void *cookie)
if (!dev_valid_net(cookie))
return API_ENODEV;
if (!dev_valid_net(cookie))
return API_ENODEV;
- if (eth_init(
gd->bd
) < 0)
+ if (eth_init() < 0)
return API_EIO;
return 0;
return API_EIO;
return 0;