diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-03 17:29:05 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-03 17:29:05 +0100 |
commit | 8e9c4aa4e7bd600d30e15ec82be9b670a1ec3da9 (patch) | |
tree | 3b19eb54c684e36feab568078018dea31c43a79f /kernel/time/ntp.c | |
parent | d60336e2f136287de821901d4a1b56179a0f7b69 (diff) | |
parent | 1d73ad298d1bfeee5d77c19e5cd667c551e30632 (diff) |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-fsl
Conflicts:
sound/soc/fsl/fsl_ssi.c
Diffstat (limited to 'kernel/time/ntp.c')
-rw-r--r-- | kernel/time/ntp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 8f5b3b98577b..bb2215174f05 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -516,13 +516,13 @@ static void sync_cmos_clock(struct work_struct *work) schedule_delayed_work(&sync_cmos_work, timespec_to_jiffies(&next)); } -static void notify_cmos_timer(void) +void ntp_notify_cmos_timer(void) { schedule_delayed_work(&sync_cmos_work, 0); } #else -static inline void notify_cmos_timer(void) { } +void ntp_notify_cmos_timer(void) { } #endif @@ -687,8 +687,6 @@ int __do_adjtimex(struct timex *txc, struct timespec *ts, s32 *time_tai) if (!(time_status & STA_NANO)) txc->time.tv_usec /= NSEC_PER_USEC; - notify_cmos_timer(); - return result; } |