diff options
| author | Tom Rini <[email protected]> | 2017-04-06 12:28:03 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-04-06 20:40:24 -0400 |
| commit | d53ecad92f06d2e38a5cbc13af7473867c7fa277 (patch) | |
| tree | cd46314f18a4e1b538a7973f1b74935f4ca2b096 /drivers/net | |
| parent | 891f7ae63318293cd5807fb611f86f545080b1f6 (diff) | |
| parent | e7bd15ea156f2a65d6aba167b9b7cd711caae2e6 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
trini: Disable CONFIG_SPL_USE_ARCH_MEMSET on orangepi_2
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/sun8i_emac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index b87210bad79..abdfada6461 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -62,7 +62,7 @@ #define AHB_GATE_OFFSET_EPHY 0 -#if defined(CONFIG_MACH_SUN8I_H3) +#if defined(CONFIG_MACH_SUNXI_H3_H5) #define SUN8I_GPD8_GMAC 2 #else #define SUN8I_GPD8_GMAC 4 |