From 42a7ccef0a06519e2ea0be71d7c0f4ed9198509f Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 31 Oct 2012 15:32:44 +0000 Subject: [PATCH] ptp: Make PTP_1588_CLOCK select rather than depend on PPS PTP hardware clock drivers that select PTP_1588_CLOCK must currently also select PPS. For those drivers that don't, the user must enable PPS, then enable PTP_1588_CLOCK, then the driver. Simplify things for developers and users by putting this selection in one place. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller --- drivers/net/ethernet/intel/Kconfig | 2 -- drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 1 - drivers/ptp/Kconfig | 5 +---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig index 9e49217ee559..d5b359df6e7c 100644 --- a/drivers/net/ethernet/intel/Kconfig +++ b/drivers/net/ethernet/intel/Kconfig @@ -124,7 +124,6 @@ config IGB_PTP bool "PTP Hardware Clock (PHC)" default n depends on IGB - select PPS select PTP_1588_CLOCK ---help--- Say Y here if you want to use PTP Hardware Clock (PHC) in the @@ -226,7 +225,6 @@ config IXGBE_PTP bool "PTP Clock Support" default n depends on IXGBE - select PPS select PTP_1588_CLOCK ---help--- Say Y here if you want support for 1588 Timestamping with a diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig index 9867bc6e43f6..d0e36f2b6fba 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig +++ b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig @@ -26,7 +26,6 @@ if PCH_GBE config PCH_PTP bool "PCH PTP clock support" default n - select PPS select PTP_1588_CLOCK select PTP_1588_CLOCK_PCH ---help--- diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index a6e4b7c4a704..131ef03fd11a 100644 --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig @@ -4,12 +4,9 @@ menu "PTP clock support" -comment "Enable Device Drivers -> PPS to see the PTP clock options." - depends on PPS=n - config PTP_1588_CLOCK tristate "PTP clock support" - depends on PPS + select PPS help The IEEE 1588 standard defines a method to precisely synchronize distributed clocks over Ethernet networks. The -- GitLab