diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:17:42 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:17:42 +0200 |
| commit | 32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7 (patch) | |
| tree | 35b56ce4860d33a3b75358251c6e4e4e7bdb38f9 /drivers/net/macb.c | |
| parent | 1730edf76c54381475e2da11f75b1ce563c4e62c (diff) | |
| parent | 3b904ccb93c3196727e2e9870cb1df903cab19ad (diff) | |
| download | u-boot-imx-32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7.zip u-boot-imx-32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7.tar.gz u-boot-imx-32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-net
Diffstat (limited to 'drivers/net/macb.c')
| -rw-r--r-- | drivers/net/macb.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index e5733f6..aa39284 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -17,9 +17,6 @@ */ #include <common.h> -#if defined(CONFIG_MACB) \ - && (defined(CONFIG_CMD_NET) || defined(CONFIG_CMD_MII)) - /* * The u-boot networking stack is a little weird. It seems like the * networking core allocates receive buffers up front without any @@ -593,5 +590,3 @@ int miiphy_write(unsigned char addr, unsigned char reg, unsigned short value) } #endif - -#endif /* CONFIG_MACB */ |