Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 340572
b: refs/heads/master
c: c562830
h: refs/heads/master
v: v3
  • Loading branch information
Ben Hutchings authored and David S. Miller committed Nov 1, 2012
1 parent da907ff commit 0f31c9a
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a8fc92778080c845eaadc369a0ecf5699a03bef0
refs/heads/master: c56283034ce28f99de494b69896528ae90cd9730
4 changes: 2 additions & 2 deletions trunk/drivers/net/ethernet/intel/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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---
Expand Down Expand Up @@ -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---
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/pps/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/ptp/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0f31c9a

Please sign in to comment.