commit d1bc6c8d5f4a9c7ca9fb2292d5c65f846dcc3995
author Ben Warren <bwarren@qstreams.com> Mon Aug 13 21:26:03 2007 -0400
committer Ben Warren <bwarren@qstreams.com> Mon Aug 13 21:26:03 2007 -0400
tree dd0722cee4758fe40f6a5cc75986ebb1a395aac2
parent f539edc076cfe52bff919dd512ba8d7af0e22092
parent 8a92b7c60b40ff79e2cc96e13aeac2a531dde473

Sync'd u-boot-net with mainline

Merge git://www.denx.de/git/u-boot

Conflicts:

	drivers/bcm570x.c
	drivers/tigon3.c

drivers/tigon3.c

diff --git a/drivers/tigon3.c b/drivers/tigon3.c
index 91e22eb..5f6a4ec 100644
--- a/drivers/tigon3.c
+++ b/drivers/tigon3.c
@@ -12,7 +12,7 @@
 /******************************************************************************/
 #include <common.h>
 #include <asm/types.h>
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && !defined(CONFIG_NET_MULTI) && \
+#if defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI) && \
 	defined(CONFIG_TIGON3)
 #ifdef CONFIG_BMW
 #include <mpc824x.h>
@@ -5695,4 +5695,5 @@
 	}
 	return LM_STATUS_SUCCESS;
 }
-#endif				/* CFG_CMD_NET, !CONFIG_NET_MULTI, CONFIG_TIGON3 */
+
+#endif