diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-02-14 14:07:21 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-02-14 14:07:21 -0600 |
| commit | 746c4b9490495dc4381dbcc49f40078d423e0a48 (patch) | |
| tree | e726020abb9e37df1fca19d8895bf203b27612d1 /drivers/net/netarm_eth.c | |
| parent | 3f2ac8f928c76cbd2374437b2d079f8b4324aaba (diff) | |
| parent | fe891ecf4d187e9d11dde869ed4623af52b54451 (diff) | |
| download | u-boot-imx-746c4b9490495dc4381dbcc49f40078d423e0a48.zip u-boot-imx-746c4b9490495dc4381dbcc49f40078d423e0a48.tar.gz u-boot-imx-746c4b9490495dc4381dbcc49f40078d423e0a48.tar.bz2 | |
Merge commit 'wd/master'
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 */ |