Messages in this thread Patch in this message | | | From | Arnd Bergmann <> | Subject | [PATCH net-next] liquidio: 'imply' ptp instead of 'select' | Date | Sat, 3 Dec 2016 00:04:32 +0100 |
| |
ptp now depends on the optional POSIX_TIMERS setting and fails to build if we select it without that:
warning: (LIQUIDIO_VF && TI_CPTS) selects PTP_1588_CLOCK which has unmet direct dependencies (NET && POSIX_TIMERS) warning: (LIQUIDIO_VF && TI_CPTS) selects PTP_1588_CLOCK which has unmet direct dependencies (NET && POSIX_TIMERS) ERROR: "posix_clock_unregister" [drivers/ptp/ptp.ko] undefined! ERROR: "posix_clock_register" [drivers/ptp/ptp.ko] undefined! ERROR: "pps_unregister_source" [drivers/ptp/ptp.ko] undefined! ERROR: "pps_event" [drivers/ptp/ptp.ko] undefined! ERROR: "pps_register_source" [drivers/ptp/ptp.ko] undefined!
It seems that two patches have collided here, the build failure is a result of the combination. Changing the new option to 'imply' as well fixes it.
Fixes: 111fc64a237f ("liquidio CN23XX: VF registration") Fixes: d1cbfd771ce8 ("ptp_clock: Allow for it to be optional") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/cavium/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig index bbc8bd16cb97..dcbce6cac63e 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. -- 2.9.0
| |