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/tigon3.c | |
| parent | b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86 (diff) | |
| parent | 5728be389e65fd47f34b33c2596271eb4db751ae (diff) | |
| download | olio-uboot-2014.01-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.tar.xz olio-uboot-2014.01-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.zip | |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'drivers/tigon3.c')
| -rw-r--r-- | drivers/tigon3.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/drivers/tigon3.c b/drivers/tigon3.c index ec2cd2ac3..860a8894f 100644 --- a/drivers/tigon3.c +++ b/drivers/tigon3.c @@ -12,7 +12,7 @@  /******************************************************************************/  #include <common.h>  #include <asm/types.h> -#if (CONFIG_COMMANDS & CFG_CMD_NET) && !defined(CONFIG_NET_MULTI) && \ +#if defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI) && \  	defined(CONFIG_TIGON3)  #ifdef CONFIG_BMW  #include <mpc824x.h> @@ -6197,4 +6197,4 @@ LM_DmaTest(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pBufferVirt,      }      return LM_STATUS_SUCCESS;  } -#endif /* CFG_CMD_NET, !CONFIG_NET_MULTI, CONFIG_TIGON3 */ +#endif |