summaryrefslogtreecommitdiffstats
path: root/drivers/lan91c96.c
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>2007-09-23 01:29:43 +0900
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>2007-09-23 01:29:43 +0900
commitb8685affe614ccf5f4ec66252b30e2e524d18948 (patch)
tree05bc55b8a4a0451e6500f1f52651d81c0f48f012 /drivers/lan91c96.c
parent69df3c4da0c93017cceb25a366e794570bd0ed98 (diff)
parent66dcad3a9a53e0766d90e0084123bd8529522fb0 (diff)
downloadtalos-obmc-uboot-b8685affe614ccf5f4ec66252b30e2e524d18948.tar.gz
talos-obmc-uboot-b8685affe614ccf5f4ec66252b30e2e524d18948.zip
Merge git://www.denx.de/git/u-boot
Conflicts: CREDITS
Diffstat (limited to 'drivers/lan91c96.c')
-rw-r--r--drivers/lan91c96.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/lan91c96.c b/drivers/lan91c96.c
index a50c5f0abe..ecdcbd9b32 100644
--- a/drivers/lan91c96.c
+++ b/drivers/lan91c96.c
@@ -65,7 +65,7 @@
#ifdef CONFIG_DRIVER_LAN91C96
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
/*------------------------------------------------------------------------
*
OpenPOWER on IntegriCloud