diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-10-31 15:31:29 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-01 11:35:17 -0400 |
| commit | c56283034ce28f99de494b69896528ae90cd9730 (patch) | |
| tree | 01b3f84384a4eda3a848742392d27409f010df63 | |
| parent | a8fc92778080c845eaadc369a0ecf5699a03bef0 (diff) | |
| download | linux-stable-c56283034ce28f99de494b69896528ae90cd9730.tar.gz linux-stable-c56283034ce28f99de494b69896528ae90cd9730.tar.bz2 linux-stable-c56283034ce28f99de494b69896528ae90cd9730.zip | |
pps, ptp: Remove dependencies on EXPERIMENTAL
These are now established subsystems, and we want drivers to be able
to select PPS and PTP_1588_CLOCK without depending on EXPERIMENTAL.
Further, the use of EXPERIMENTAL is now deprecated in general.
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 | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/pps/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ptp/Kconfig | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig index 0cafe4fe9406..9e49217ee559 100644 --- a/drivers/net/ethernet/intel/Kconfig +++ b/drivers/net/ethernet/intel/Kconfig @@ -123,7 +123,7 @@ config IGB_DCA config IGB_PTP bool "PTP Hardware Clock (PHC)" default n - depends on IGB && EXPERIMENTAL + depends on IGB select PPS select PTP_1588_CLOCK ---help--- @@ -225,7 +225,7 @@ config IXGBE_DCB config IXGBE_PTP bool "PTP Clock Support" default n - depends on IXGBE && EXPERIMENTAL + depends on IXGBE select PPS select PTP_1588_CLOCK ---help--- diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig index 5296cc8d3cba..9867bc6e43f6 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 - depends on EXPERIMENTAL select PPS select PTP_1588_CLOCK select PTP_1588_CLOCK_PCH diff --git a/drivers/pps/Kconfig b/drivers/pps/Kconfig index 258ca596e1bc..982d16b5a846 100644 --- a/drivers/pps/Kconfig +++ b/drivers/pps/Kconfig @@ -6,7 +6,6 @@ menu "PPS support" config PPS tristate "PPS support" - depends on EXPERIMENTAL ---help--- PPS (Pulse Per Second) is a special pulse provided by some GPS antennae. Userland can use it to get a high-precision time diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index ffdf712f9a67..a6e4b7c4a704 100644 --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig @@ -9,7 +9,6 @@ comment "Enable Device Drivers -> PPS to see the PTP clock options." config PTP_1588_CLOCK tristate "PTP clock support" - depends on EXPERIMENTAL depends on PPS help The IEEE 1588 standard defines a method to precisely |