From 802abe8434682ba70a0da93269959941eece5aab Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Thu, 27 Nov 2014 16:54:19 +0100 Subject: arm: imx: iim/ocotp: fix link error when !CONFIG_NET Don't try to attach mac to device if there is no net support selected. Fixes: undefined reference to `dev_add_param_mac' in both iim and ocotp drivers. Signed-off-by: Lucas Stach Signed-off-by: Sascha Hauer --- arch/arm/mach-imx/iim.c | 3 ++- arch/arm/mach-imx/ocotp.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c index 2546b921f1..d082d2d9a5 100644 --- a/arch/arm/mach-imx/iim.c +++ b/arch/arm/mach-imx/iim.c @@ -371,7 +371,8 @@ static void imx_iim_init_dt(struct device_d *dev, struct iim_priv *iim) dev_err(dev, "cannot read: %s\n", strerror(-ret)); } - imx_iim_add_mac_param(iim, macnum, bank, offset); + if (IS_ENABLED(CONFIG_NET)) + imx_iim_add_mac_param(iim, macnum, bank, offset); macnum++; len -= MAC_ADDRESS_PROPLEN; diff --git a/arch/arm/mach-imx/ocotp.c b/arch/arm/mach-imx/ocotp.c index 837500fff8..5912d75866 100644 --- a/arch/arm/mach-imx/ocotp.c +++ b/arch/arm/mach-imx/ocotp.c @@ -432,8 +432,10 @@ static int imx_ocotp_probe(struct device_d *dev) NULL, NULL, &priv->permanent_write_enable, NULL); } - dev_add_param_mac(&(priv->dev), "mac_addr", imx_ocotp_set_mac, - imx_ocotp_get_mac, priv->ethaddr, priv); + if (IS_ENABLED(CONFIG_NET)) + dev_add_param_mac(&(priv->dev), "mac_addr", imx_ocotp_set_mac, + imx_ocotp_get_mac, priv->ethaddr, priv); + dev_add_param_bool(&(priv->dev), "sense_enable", NULL, NULL, &priv->sense_enable, priv); return 0; -- cgit v1.2.3