diff mbox series

linux-next: build failure after merge of the net-next tree

Message ID 20190829200546.7b9af296@canb.auug.org.au
State Accepted
Delegated to: David Miller
Headers show
Series linux-next: build failure after merge of the net-next tree | expand

Commit Message

Stephen Rothwell Aug. 29, 2019, 10:05 a.m. UTC
Hi all,

After merging the net-next tree, today's linux-next build (powepc
allmodconfig) failed like this:

ld: drivers/net/ethernet/stmicro/stmmac/stmmac_pci.o: in function `.stmmac_pci_remove':
stmmac_pci.c:(.text.stmmac_pci_remove+0x68): undefined reference to `.clk_unregister_fixed_rate'
ld: drivers/net/ethernet/stmicro/stmmac/stmmac_pci.o: in function `.intel_mgbe_common_data':
stmmac_pci.c:(.text.intel_mgbe_common_data+0x2a8): undefined reference to `.clk_register_fixed_rate'

Caused by commit

  190f73ab4c43 ("net: stmmac: setup higher frequency clk support for EHL & TGL")

CONFIG_COMMON_CLK is not set for this build.

I have added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Aug 2019 19:49:27 +1000
Subject: [PATCH] net: stmmac: depend on COMMON_CLK

Fixes: 190f73ab4c43 ("net: stmmac: setup higher frequency clk support for EHL & TGL")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/stmicro/stmmac/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

David Miller Aug. 30, 2019, 9:35 p.m. UTC | #1
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Aug 2019 20:05:46 +1000

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 29 Aug 2019 19:49:27 +1000
> Subject: [PATCH] net: stmmac: depend on COMMON_CLK
> 
> Fixes: 190f73ab4c43 ("net: stmmac: setup higher frequency clk support for EHL & TGL")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index 2325b40dff6e..338e25a6374e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -200,6 +200,7 @@  endif
 config STMMAC_PCI
 	tristate "STMMAC PCI bus support"
 	depends on STMMAC_ETH && PCI
+	depends on COMMON_CLK
 	---help---
 	  This selects the platform specific bus support for the stmmac driver.
 	  This driver was tested on XLINX XC2V3000 FF1152AMT0221