diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-15 21:06:27 +0200 | 
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-15 21:06:27 +0200 | 
| commit | b706d63559aeec352bc72dd86d7d5423c15f6a60 (patch) | |
| tree | fdeda4d61970fef239d9d66ecd851fa46cfe5ec0 /drivers/plb2800_eth.c | |
| parent | c8603cfbd4573379a6076c9c208545ba2bbf019a (diff) | |
| parent | 594e79838ce5078a90d0c27abb2b2d61d5f8e8a7 (diff) | |
| download | olio-uboot-2014.01-b706d63559aeec352bc72dd86d7d5423c15f6a60.tar.xz olio-uboot-2014.01-b706d63559aeec352bc72dd86d7d5423c15f6a60.zip | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'drivers/plb2800_eth.c')
| -rw-r--r-- | drivers/plb2800_eth.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/drivers/plb2800_eth.c b/drivers/plb2800_eth.c index 4c683d7a5..0ae5d808a 100644 --- a/drivers/plb2800_eth.c +++ b/drivers/plb2800_eth.c @@ -25,8 +25,8 @@  #include <common.h> -#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) \ -	&& defined(CONFIG_PLB2800_ETHER) +#if defined(CONFIG_CMD_NET) \ +	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_PLB2800_ETHER)  #include <malloc.h>  #include <net.h> |