diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /include/net.h | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'include/net.h')
| -rw-r--r-- | include/net.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/net.h b/include/net.h index 79ddfa294..a5a256bcd 100644 --- a/include/net.h +++ b/include/net.h @@ -38,16 +38,16 @@ #define CONFIG_NET_MULTI #if (CONFIG_ETHER_INDEX == 1) #define CONFIG_ETHER_ON_FCC1 -# define CFG_CMXFCR_MASK1 CFG_CMXFCR_MASK -# define CFG_CMXFCR_VALUE1 CFG_CMXFCR_VALUE +# define CONFIG_SYS_CMXFCR_MASK1 CONFIG_SYS_CMXFCR_MASK +# define CONFIG_SYS_CMXFCR_VALUE1 CONFIG_SYS_CMXFCR_VALUE #elif (CONFIG_ETHER_INDEX == 2) #define CONFIG_ETHER_ON_FCC2 -# define CFG_CMXFCR_MASK2 CFG_CMXFCR_MASK -# define CFG_CMXFCR_VALUE2 CFG_CMXFCR_VALUE +# define CONFIG_SYS_CMXFCR_MASK2 CONFIG_SYS_CMXFCR_MASK +# define CONFIG_SYS_CMXFCR_VALUE2 CONFIG_SYS_CMXFCR_VALUE #elif (CONFIG_ETHER_INDEX == 3) #define CONFIG_ETHER_ON_FCC3 -# define CFG_CMXFCR_MASK3 CFG_CMXFCR_MASK -# define CFG_CMXFCR_VALUE3 CFG_CMXFCR_VALUE +# define CONFIG_SYS_CMXFCR_MASK3 CONFIG_SYS_CMXFCR_MASK +# define CONFIG_SYS_CMXFCR_VALUE3 CONFIG_SYS_CMXFCR_VALUE #endif /* CONFIG_ETHER_INDEX */ #endif /* CONFIG_ETHER_ON_FCC */ #endif /* !CONFIG_NET_MULTI && CONFIG_8260 */ @@ -61,8 +61,8 @@ * */ -#ifdef CFG_RX_ETH_BUFFER -# define PKTBUFSRX CFG_RX_ETH_BUFFER +#ifdef CONFIG_SYS_RX_ETH_BUFFER +# define PKTBUFSRX CONFIG_SYS_RX_ETH_BUFFER #else # define PKTBUFSRX 4 #endif |