LiquidIO VF: s/select/imply/ for PTP_1588_CLOCK

Message ID alpine.LFD.2.20.1701031331450.21662@knanqh.ubzr
State New
Headers show

Commit Message

Nicolas Pitre Jan. 3, 2017, 6:57 p.m.
Fix a minor fallout from the merge of the timers and the networking 
trees. The following error may result if the PTP_1588_CLOCK 
prerequisites are not available:

drivers/built-in.o: In function `ptp_clock_unregister':
(.text+0x40e0a5): undefined reference to `pps_unregister_source'
drivers/built-in.o: In function `ptp_clock_unregister':
(.text+0x40e0cc): undefined reference to `posix_clock_unregister'
drivers/built-in.o: In function `ptp_clock_event':
(.text+0x40e249): undefined reference to `pps_event'
drivers/built-in.o: In function `ptp_clock_register':
(.text+0x40e5e1): undefined reference to `pps_register_source'
drivers/built-in.o: In function `ptp_clock_register':
(.text+0x40e62c): undefined reference to `posix_clock_register'
drivers/built-in.o: In function `ptp_clock_register':
(.text+0x40e68d): undefined reference to `pps_unregister_source'

Signed-off-by: Nicolas Pitre <nico@linaro.org>

Comments

Richard Cochran Jan. 3, 2017, 7:24 p.m. | #1
On Tue, Jan 03, 2017 at 01:57:00PM -0500, Nicolas Pitre wrote:
> Fix a minor fallout from the merge of the timers and the networking 

> trees. The following error may result if the PTP_1588_CLOCK 

> prerequisites are not available:

> 

> drivers/built-in.o: In function `ptp_clock_unregister':

> (.text+0x40e0a5): undefined reference to `pps_unregister_source'

> drivers/built-in.o: In function `ptp_clock_unregister':

> (.text+0x40e0cc): undefined reference to `posix_clock_unregister'

> drivers/built-in.o: In function `ptp_clock_event':

> (.text+0x40e249): undefined reference to `pps_event'

> drivers/built-in.o: In function `ptp_clock_register':

> (.text+0x40e5e1): undefined reference to `pps_register_source'

> drivers/built-in.o: In function `ptp_clock_register':

> (.text+0x40e62c): undefined reference to `posix_clock_register'

> drivers/built-in.o: In function `ptp_clock_register':

> (.text+0x40e68d): undefined reference to `pps_unregister_source'

> 

> Signed-off-by: Nicolas Pitre <nico@linaro.org>


Thanks for following up on this.

Acked-by: Richard Cochran <richardcochran@gmail.com>
David Miller Jan. 4, 2017, 6:27 p.m. | #2
From: Nicolas Pitre <nicolas.pitre@linaro.org>

Date: Tue, 3 Jan 2017 13:57:00 -0500 (EST)

> Fix a minor fallout from the merge of the timers and the networking 

> trees. The following error may result if the PTP_1588_CLOCK 

> prerequisites are not available:

> 

> drivers/built-in.o: In function `ptp_clock_unregister':

> (.text+0x40e0a5): undefined reference to `pps_unregister_source'

> drivers/built-in.o: In function `ptp_clock_unregister':

> (.text+0x40e0cc): undefined reference to `posix_clock_unregister'

> drivers/built-in.o: In function `ptp_clock_event':

> (.text+0x40e249): undefined reference to `pps_event'

> drivers/built-in.o: In function `ptp_clock_register':

> (.text+0x40e5e1): undefined reference to `pps_register_source'

> drivers/built-in.o: In function `ptp_clock_register':

> (.text+0x40e62c): undefined reference to `posix_clock_register'

> drivers/built-in.o: In function `ptp_clock_register':

> (.text+0x40e68d): undefined reference to `pps_unregister_source'

> 

> Signed-off-by: Nicolas Pitre <nico@linaro.org>


Applied, thanks.

Patch

diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig
index bbc8bd16cb..dcbce6cac6 100644
--- a/drivers/net/ethernet/cavium/Kconfig
+++ b/drivers/net/ethernet/cavium/Kconfig
@@ -77,7 +77,7 @@  config OCTEON_MGMT_ETHERNET
 config LIQUIDIO_VF
 	tristate "Cavium LiquidIO VF support"
 	depends on 64BIT && PCI_MSI
-	select PTP_1588_CLOCK
+	imply PTP_1588_CLOCK
 	---help---
 	  This driver supports Cavium LiquidIO Intelligent Server Adapter
 	  based on CN23XX chips.