summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2016-07-22 09:22:26 -0400
committerTom Rini <[email protected]>2016-07-22 09:22:26 -0400
commit9f03247edc7761b608db31104821b4518a70e691 (patch)
tree1f42f9d51050f960148adc49177f811b250588b9 /api
parent89ca873e2ddea859526f25f678fa53dda055e90f (diff)
parent766d2609dd7fbad0faa89c7dff26edc108afa890 (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'api')
-rw-r--r--api/api_net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/api_net.c b/api/api_net.c
index 04e4f4a44ef..67c291682a6 100644
--- 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)
-#ifdef CONFIG_CMD_NET
+#if defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)
static int dev_valid_net(void *cookie)
{