summaryrefslogtreecommitdiff
path: root/drivers/net/cs8900.c
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2008-02-14 10:11:14 -0600
committerAndrew Fleming-AFLEMING <afleming@freescale.com>2008-02-14 10:11:14 -0600
commit3f2175fa840925e2028c5d482e4cefa787cc8703 (patch)
tree37dab4aa866865e647beda2993e710b4f246fb8f /drivers/net/cs8900.c
parentd1bcf9e53b41dfa4be6943b739ee82627a0a6d31 (diff)
parentfe891ecf4d187e9d11dde869ed4623af52b54451 (diff)
Merge branch 'denx'
Diffstat (limited to 'drivers/net/cs8900.c')
-rw-r--r--drivers/net/cs8900.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c
index 80c4ba21a6..55ef346340 100644
--- a/drivers/net/cs8900.c
+++ b/drivers/net/cs8900.c
@@ -165,7 +165,7 @@ void cs8900_get_enetaddr (uchar * addr)
addr[0], addr[1],
addr[2], addr[3],
addr[4], addr[5]) ;
- debug ("### Set environment from HW MAC addr = \"%s\"\n", ethaddr);
+ debug ("### Set environment from HW MAC addr = \"%s\"\n", ethaddr);
setenv ("ethaddr", ethaddr);
}
@@ -317,6 +317,6 @@ int cs8900_e2prom_write(unsigned char addr, unsigned short value)
return 0;
}
-#endif /* COMMANDS & CFG_NET */
+#endif /* CONFIG_CMD_NET */
#endif /* CONFIG_DRIVER_CS8900 */