diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-24 15:59:02 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-24 15:59:02 (GMT) |
| commit | 2ee490a0245b65826a8ce8e42e34c9bf805d3656 (patch) | |
| tree | c53f7d3513bd284b181d3aaa61534a0d62751884 /include/configs | |
| parent | ec8fb48ce98987065493b27422200897cf0909f8 (diff) | |
| parent | 0a71cd77290ca317ecf6f15984a91abbee741e09 (diff) | |
| download | u-boot-fsl-qoriq-2ee490a0245b65826a8ce8e42e34c9bf805d3656.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
drivers/net/zynq_gem.c
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/ti_omap5_common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index b049be4..2135af0 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -153,6 +153,7 @@ #ifdef CONFIG_SPL_BUILD #undef CONFIG_DM_MMC #undef CONFIG_TIMER +#undef CONFIG_DM_ETH #endif #endif /* __CONFIG_TI_OMAP5_COMMON_H */ |