aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2012-10-31 11:31:29 -0400
committerDavid S. Miller <davem@davemloft.net>2012-11-01 11:35:17 -0400
commitc56283034ce28f99de494b69896528ae90cd9730 (patch)
tree01b3f84384a4eda3a848742392d27409f010df63
parenta8fc92778080c845eaadc369a0ecf5699a03bef0 (diff)
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/Kconfig4
-rw-r--r--drivers/net/ethernet/oki-semi/pch_gbe/Kconfig1
-rw-r--r--drivers/pps/Kconfig1
-rw-r--r--drivers/ptp/Kconfig1
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
123config IGB_PTP 123config IGB_PTP
124 bool "PTP Hardware Clock (PHC)" 124 bool "PTP Hardware Clock (PHC)"
125 default n 125 default n
126 depends on IGB && EXPERIMENTAL 126 depends on IGB
127 select PPS 127 select PPS
128 select PTP_1588_CLOCK 128 select PTP_1588_CLOCK
129 ---help--- 129 ---help---
@@ -225,7 +225,7 @@ config IXGBE_DCB
225config IXGBE_PTP 225config IXGBE_PTP
226 bool "PTP Clock Support" 226 bool "PTP Clock Support"
227 default n 227 default n
228 depends on IXGBE && EXPERIMENTAL 228 depends on IXGBE
229 select PPS 229 select PPS
230 select PTP_1588_CLOCK 230 select PTP_1588_CLOCK
231 ---help--- 231 ---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
26config PCH_PTP 26config PCH_PTP
27 bool "PCH PTP clock support" 27 bool "PCH PTP clock support"
28 default n 28 default n
29 depends on EXPERIMENTAL
30 select PPS 29 select PPS
31 select PTP_1588_CLOCK 30 select PTP_1588_CLOCK
32 select PTP_1588_CLOCK_PCH 31 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"
6 6
7config PPS 7config PPS
8 tristate "PPS support" 8 tristate "PPS support"
9 depends on EXPERIMENTAL
10 ---help--- 9 ---help---
11 PPS (Pulse Per Second) is a special pulse provided by some GPS 10 PPS (Pulse Per Second) is a special pulse provided by some GPS
12 antennae. Userland can use it to get a high-precision time 11 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."
9 9
10config PTP_1588_CLOCK 10config PTP_1588_CLOCK
11 tristate "PTP clock support" 11 tristate "PTP clock support"
12 depends on EXPERIMENTAL
13 depends on PPS 12 depends on PPS
14 help 13 help
15 The IEEE 1588 standard defines a method to precisely 14 The IEEE 1588 standard defines a method to precisely