commit ab77bc547ba561c25ea34457ed17aa0b2f7c2723
author TsiChungLiew <Tsi-Chung.Liew@freescale.com> Wed Aug 15 15:39:17 2007 -0500
committer John Rigby <jrigby@freescale.com> Thu Aug 16 17:43:19 2007 -0600
tree c7e9d3c146f22730638ca0c63f1e6f150bb9a6a2
parent 81735b2568cf634d601c0d4a1bbc3a3882bc8eda

ColdFire: MCF5329 Update and cleanup

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>

drivers/net/mcffec.c

diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index fde1aae..68a0ee6 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -51,7 +51,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI)
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
 
 struct fec_info_s fec_info[] = {
 #ifdef CFG_FEC0_IOBASE
@@ -410,7 +410,7 @@
 
 	fec_reset(dev);
 
-#if (CONFIG_COMMANDS & CFG_CMD_MII) || defined (CONFIG_MII) || \
+#if defined(CONFIG_CMD_MII) || defined (CONFIG_MII) || \
 	defined (CFG_DISCOVER_PHY)
 
 	mii_init();
@@ -420,7 +420,7 @@
 #ifndef CFG_DISCOVER_PHY
 	setFecDuplexSpeed(fecp, bd, (FECDUPLEX << 16) | FECSPEED);
 #endif				/* ifndef CFG_DISCOVER_PHY */
-#endif				/* CFG_CMD_MII || CONFIG_MII */
+#endif				/* CONFIG_CMD_MII || CONFIG_MII */
 
 	/* We use strictly polling mode only */
 	fecp->eimr = 0;
@@ -568,7 +568,7 @@
 
 		eth_register(dev);
 
-#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
+#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
 		miiphy_register(dev->name,
 				mcffec_miiphy_read, mcffec_miiphy_write);
 #endif
@@ -580,5 +580,5 @@
 	return 1;
 }
 
-#endif				/* CFG_CMD_NET, FEC_ENET & NET_MULTI */
+#endif				/* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
 #endif				/* CONFIG_MCFFEC */