diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 00:01:51 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 00:01:51 -0800 |
| commit | 2054271bb008de0bcf0bdc5d6041613f616420f2 (patch) | |
| tree | 24e638944597399d28c0432a5f6a323d3181c8a6 /include/linux/ptp_clock_kernel.h | |
| parent | 12480c2e53d355223cf6884ed1f56e6ac9b7c21f (diff) | |
| parent | 8757e168190a6ed2cd4aa23fc59bf86b0091b596 (diff) | |
Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical
From Haojian Zhuang:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
ARM: pxa: fix pxa25x gpio wakeup setting
+ Linux 3.7-rc6
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. |