diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-11 00:40:22 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-11 00:40:22 -0700 |
| commit | e5a68ffaa375a3503ac31de90a8a2c09d5526740 (patch) | |
| tree | 338be0f46e39dddfdbe0c5d81a40e4d1815d600e /include/linux | |
| parent | 0f0e37eeace714d4b3bb6907323d46ba2c6d73f1 (diff) | |
| parent | 9aabfa05967291ecbc7a0bfcca27c9669dd1853e (diff) | |
Merge "Merge android-4.4@8c91412 (v4.4.75) into msm-4.4"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/timekeeper_internal.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h index 25247220b4b7..f0f1793cfa49 100644 --- a/include/linux/timekeeper_internal.h +++ b/include/linux/timekeeper_internal.h @@ -29,7 +29,6 @@ */ struct tk_read_base { struct clocksource *clock; - cycle_t (*read)(struct clocksource *cs); cycle_t mask; cycle_t cycle_last; u32 mult; |