Merge branch 'next'

Merge the outstanding changes from the 'next' branch to master.

1 files changed, 0 insertions, 11 deletions

diff --git a/common/exports.c b/common/exports.c
index 48b084c3861..1b7fec685b1 100644
--- a/common/exports.c
+++ b/common/exports.c
@@ -7,10 +7,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-__attribute__((unused)) static void dummy(void)
-{
-}
-
 unsigned long get_version(void)
 {
 	return XF_VERSION;
@@ -18,13 +14,6 @@ unsigned long get_version(void)
 
 #define EXPORT_FUNC(f, a, x, ...)  gd->jt->x = f;
 
-#ifndef CONFIG_PHY_AQUANTIA
-# define mdio_get_current_dev		dummy
-# define phy_find_by_mask		dummy
-# define mdio_phydev_for_ethname	dummy
-# define miiphy_set_current_dev		dummy
-#endif
-
 int jumptable_init(void)
 {
 	gd->jt = malloc(sizeof(struct jt_funcs));