projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'upstream/master'
[platform/kernel/u-boot.git]
/
board
/
atmel
/
atstk1000
/
eth.c
diff --git
a/board/atmel/atstk1000/eth.c
b/board/atmel/atstk1000/eth.c
index
3a7916e
..
b2b1a12
100644
(file)
--- a/
board/atmel/atstk1000/eth.c
+++ b/
board/atmel/atstk1000/eth.c
@@
-27,7
+27,7
@@
extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
-#if defined(CONFIG_MACB) &&
(CONFIG_COMMANDS & CF
G_CMD_NET)
+#if defined(CONFIG_MACB) &&
defined(CONFI
G_CMD_NET)
void atstk1000_eth_initialize(bd_t *bi)
{
int id = 0;
void atstk1000_eth_initialize(bd_t *bi)
{
int id = 0;