diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2019-10-29 11:43:29 +0100 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2019-10-29 11:43:29 +0100 |
| commit | 822bbba0cabb50825a0ce22707dc45eb82d02853 (patch) | |
| tree | ea61d4ca72cb60b4cae8e95f64eefa7cd2a36603 /drivers/ptp/Kconfig | |
| parent | Documentation/scheduler: fix links in sched-stats (diff) | |
| parent | Linux 5.4-rc4 (diff) | |
| download | linux-822bbba0cabb50825a0ce22707dc45eb82d02853.tar.xz linux-822bbba0cabb50825a0ce22707dc45eb82d02853.zip | |
Merge tag 'v5.4-rc4' into docs-next
I need to pick up the independent changes made to
Documentation/core-api/memory-allocation.rst to be able to merge further
work without creating a total mess.
Diffstat (limited to 'drivers/ptp/Kconfig')
| -rw-r--r-- | drivers/ptp/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index 960961fb0d7c..0517272a268e 100644 --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig @@ -97,8 +97,8 @@ config PTP_1588_CLOCK_PCH help This driver adds support for using the PCH EG20T as a PTP clock. The hardware supports time stamping of PTP packets - when using the end-to-end delay (E2E) mechansim. The peer - delay mechansim (P2P) is not supported. + when using the end-to-end delay (E2E) mechanism. The peer + delay mechanism (P2P) is not supported. This clock is only useful if your PTP programs are getting hardware time stamps on the PTP Ethernet packets using the |