From fd1c71a24df279dafbfe2c82cb7d8ad18f93d626 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 31 Oct 2012 15:32:44 +0000 Subject: [PATCH] --- yaml --- r: 340573 b: refs/heads/master c: 42a7ccef0a06519e2ea0be71d7c0f4ed9198509f h: refs/heads/master i: 340571: da907ff5380027609178235769fb5f5170fe875d v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/Kconfig | 2 -- trunk/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 1 - trunk/drivers/ptp/Kconfig | 5 +---- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 943d3e0fe66f..d03d8b3e2dd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c56283034ce28f99de494b69896528ae90cd9730 +refs/heads/master: 42a7ccef0a06519e2ea0be71d7c0f4ed9198509f diff --git a/trunk/drivers/net/ethernet/intel/Kconfig b/trunk/drivers/net/ethernet/intel/Kconfig index 9e49217ee559..d5b359df6e7c 100644 --- a/trunk/drivers/net/ethernet/intel/Kconfig +++ b/trunk/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/trunk/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig index 9867bc6e43f6..d0e36f2b6fba 100644 --- a/trunk/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig +++ b/trunk/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/trunk/drivers/ptp/Kconfig b/trunk/drivers/ptp/Kconfig index a6e4b7c4a704..131ef03fd11a 100644 --- a/trunk/drivers/ptp/Kconfig +++ b/trunk/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