summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-08-19 20:31:30 +0200
committerOlof Johansson <olof@lixom.net>2015-08-21 18:37:38 +0200
commit6be4b0da4ecf1472cb4a064c752214dcb2ba4be2 (patch)
tree5e7883122b22e78b01a70da9925c7fcd93a566cb /arch
parentMerge tag 'omap-for-v4.3/soc-pt2' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
downloadlinux-6be4b0da4ecf1472cb4a064c752214dcb2ba4be2.tar.xz
linux-6be4b0da4ecf1472cb4a064c752214dcb2ba4be2.zip
ARM: imx: mach-imx6ul: Fix allmodconfig build
We should call phy_register_fixup_for_uid() only when CONFIG_PHYLIB is built-in, otherwise we get the following link error when building allmodconfig: arch/arm/mach-imx/built-in.o: In function `imx6ul_init_machine': :(.init.text+0xa714): undefined reference to `phy_register_fixup_for_uid' This is the same approach done in mach-imx6q.c and mach-imx6sx.c. Reported-by: Olof Johansson <olof@lixom.net> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/mach-imx6ul.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-imx6ul.c b/arch/arm/mach-imx/mach-imx6ul.c
index db74da5b46af..1b97fe133cef 100644
--- a/arch/arm/mach-imx/mach-imx6ul.c
+++ b/arch/arm/mach-imx/mach-imx6ul.c
@@ -45,7 +45,9 @@ static int ksz8081_phy_fixup(struct phy_device *dev)
static void __init imx6ul_enet_phy_init(void)
{
- phy_register_fixup_for_uid(PHY_ID_KSZ8081, 0xffffffff, ksz8081_phy_fixup);
+ if (IS_BUILTIN(CONFIG_PHYLIB))
+ phy_register_fixup_for_uid(PHY_ID_KSZ8081, 0xffffffff,
+ ksz8081_phy_fixup);
}
static inline void imx6ul_enet_init(void)