diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-14 16:36:29 +0200 | 
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-14 16:36:29 +0200 | 
| commit | 3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae (patch) | |
| tree | fb66bf8861d9f78765160d734a438856f5317cdb /drivers/natsemi.c | |
| parent | 4ce846ec59f36b85d6644a769690ad3feb667575 (diff) | |
| parent | 4ef35e53c693556c54b0c22d6f873de87bade253 (diff) | |
| download | olio-uboot-2014.01-3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae.tar.xz olio-uboot-2014.01-3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae.zip | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'drivers/natsemi.c')
| -rw-r--r-- | drivers/natsemi.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/drivers/natsemi.c b/drivers/natsemi.c index b009db63e..075d6c52c 100644 --- a/drivers/natsemi.c +++ b/drivers/natsemi.c @@ -56,8 +56,8 @@  #include <asm/io.h>  #include <pci.h> -#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) && \ -	defined(CONFIG_NATSEMI) +#if defined(CONFIG_CMD_NET) \ +	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_NATSEMI)  /* defines */  #define EEPROM_SIZE 0xb /*12 16-bit chunks, or 24 bytes*/ |