diff options
| author | Andy Fleming <afleming@freescale.com> | 2008-02-14 10:11:14 -0600 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2008-02-14 10:11:14 -0600 |
| commit | 3f2175fa840925e2028c5d482e4cefa787cc8703 (patch) | |
| tree | 37dab4aa866865e647beda2993e710b4f246fb8f /drivers/net/netarm_eth.c | |
| parent | d1bcf9e53b41dfa4be6943b739ee82627a0a6d31 (diff) | |
| parent | fe891ecf4d187e9d11dde869ed4623af52b54451 (diff) | |
| download | u-boot-imx-3f2175fa840925e2028c5d482e4cefa787cc8703.zip u-boot-imx-3f2175fa840925e2028c5d482e4cefa787cc8703.tar.gz u-boot-imx-3f2175fa840925e2028c5d482e4cefa787cc8703.tar.bz2 | |
Merge branch 'denx'
Diffstat (limited to 'drivers/net/netarm_eth.c')
| -rw-r--r-- | drivers/net/netarm_eth.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/netarm_eth.c b/drivers/net/netarm_eth.c index a99ee5d..ecf45dc 100644 --- a/drivers/net/netarm_eth.c +++ b/drivers/net/netarm_eth.c @@ -29,7 +29,6 @@ #include "netarm_eth.h" #include <asm/arch/netarm_registers.h> - #if defined(CONFIG_CMD_NET) static int na_mii_poll_busy (void); @@ -56,7 +55,6 @@ static void na_get_mac_addr (void) setenv ("ethaddr", ethaddr); } - static void na_mii_write (int reg, int value) { int mii_addr; @@ -355,6 +353,6 @@ extern int eth_send (volatile void *packet, int length) return 1; } -#endif /* COMMANDS & CFG_NET */ +#endif /* CONFIG_CMD_NET */ #endif /* CONFIG_DRIVER_NETARMETH */ |