diff options
author | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 |
commit | f2c2a937d8c4a44f63ff88bf82023e03a29497a2 (patch) | |
tree | fa8f7c9fb65d10259e76c40c52cf8277947424d4 /drivers/rtl8139.c | |
parent | b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86 (diff) | |
parent | 5728be389e65fd47f34b33c2596271eb4db751ae (diff) | |
download | u-boot-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.tar.gz |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'drivers/rtl8139.c')
-rw-r--r-- | drivers/rtl8139.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtl8139.c b/drivers/rtl8139.c index afe1a4fdaf..9045523a31 100644 --- a/drivers/rtl8139.c +++ b/drivers/rtl8139.c @@ -77,7 +77,7 @@ #include <asm/io.h> #include <pci.h> -#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) && \ +#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \ defined(CONFIG_RTL8139) #define TICKS_PER_SEC CFG_HZ @@ -535,4 +535,4 @@ static void rtl_disable(struct eth_device *dev) udelay (100); /* wait 100us */ } } -#endif /* CFG_CMD_NET && CONFIG_NET_MULTI && CONFIG_RTL8139 */ +#endif |