]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: imx: mach-imx6ul: Fix allmodconfig build
authorFabio Estevam <fabio.estevam@freescale.com>
Wed, 19 Aug 2015 18:31:30 +0000 (15:31 -0300)
committerOlof Johansson <olof@lixom.net>
Fri, 21 Aug 2015 16:37:38 +0000 (09:37 -0700)
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>
arch/arm/mach-imx/mach-imx6ul.c

index db74da5b46aff4be3efec567e06ab9d1a4737048..1b97fe133cef0aa47a50946e3d163c4483451212 100644 (file)
@@ -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)