diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-10-31 15:32:44 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-01 11:35:18 -0400 |
| commit | 42a7ccef0a06519e2ea0be71d7c0f4ed9198509f (patch) | |
| tree | 6171e6df724508370d36310a10a40664be22b7f7 | |
| parent | c56283034ce28f99de494b69896528ae90cd9730 (diff) | |
| download | op-kernel-dev-42a7ccef0a06519e2ea0be71d7c0f4ed9198509f.zip op-kernel-dev-42a7ccef0a06519e2ea0be71d7c0f4ed9198509f.tar.gz | |
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 <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/intel/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ptp/Kconfig | 5 |
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig index 9e49217..d5b359d 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 9867bc6..d0e36f2 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 a6e4b7c..131ef03 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 |
