diff options
author | Tom Rini <trini@konsulko.com> | 2017-05-26 15:18:53 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-05-26 15:18:53 (GMT) |
commit | 8dc1b17f14c9201c7d0da0f33e404a7e051b2ec6 (patch) | |
tree | b4566d2d99140d4180efc2ca9f32b2ddf3e310a8 /include/configs | |
parent | be62fbf376261ab3a4ed5db3bf54d5df9e216d9f (diff) | |
parent | be71a179bdd935336fb0bee8283be729144ac965 (diff) | |
download | u-boot-8dc1b17f14c9201c7d0da0f33e404a7e051b2ec6.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-nds32
Move FTMAC100 to where it should be, alphabetically in
drivers/net/Kconfig
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/adp-ae3xx.h | 5 | ||||
-rw-r--r-- | include/configs/adp-ag101p.h | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index edc742d..6bfc08e 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -90,11 +90,6 @@ #define CONFIG_SYS_NS16550_CLK ((18432000 * 20) / 25) /* AG101P */ /* - * Ethernet - */ -#define CONFIG_FTMAC100 - -/* * SD (MMC) controller */ #define CONFIG_FTSDC010 diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index bc122d3..4cef64e 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -96,11 +96,6 @@ #define CONFIG_SYS_NS16550_CLK ((18432000 * 20) / 25) /* AG101P */ /* - * Ethernet - */ -#define CONFIG_FTMAC100 - -/* * SD (MMC) controller */ #define CONFIG_FTSDC010 |