diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-11 18:28:26 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-11 18:28:26 -0800 |
| commit | f8b06550509fd68f673dc4ced482d2faa8efb531 (patch) | |
| tree | 149851e7887443d42251d4b84f2c65112efe09cb /include/linux/ptp_clock_kernel.h | |
| parent | fb7d2ebd217a2a3cead4402b47c65c25881a2f75 (diff) | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
Merge 3.7-rc5 into staging-next
Diffstat (limited to 'include/linux/ptp_clock_kernel.h')
| -rw-r--r-- | include/linux/ptp_clock_kernel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h index f2dc6d8fc680..38a993508327 100644 --- a/include/linux/ptp_clock_kernel.h +++ b/include/linux/ptp_clock_kernel.h @@ -54,7 +54,8 @@ struct ptp_clock_request { * clock operations * * @adjfreq: Adjusts the frequency of the hardware clock. - * parameter delta: Desired period change in parts per billion. + * parameter delta: Desired frequency offset from nominal frequency + * in parts per billion * * @adjtime: Shifts the time of the hardware clock. * parameter delta: Desired change in nanoseconds. |