diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-05-29 09:55:01 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-05-29 09:55:01 +0200 |
| commit | 67dd331c5d811b2e50c935a24c82f31b61c6dcd3 (patch) | |
| tree | 0980dd54ec6ea9566be374738baacafd8b9c7492 /kernel/time/ntp.c | |
| parent | 15ef0298deb3929eb6ad6d2334fd2059fd53807c (diff) | |
| parent | 0d6bd9953f739dad96d9a0de65383e479ab4e10d (diff) | |
Merge branch 'fortglx/3.10/time' of git://git.linaro.org/people/jstultz/linux into timers/urgent
Diffstat (limited to 'kernel/time/ntp.c')
| -rw-r--r-- | kernel/time/ntp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 12ff13a838c..8f5b3b98577 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -874,7 +874,6 @@ static void hardpps_update_phase(long error) void __hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts) { struct pps_normtime pts_norm, freq_norm; - unsigned long flags; pts_norm = pps_normalize_ts(*phase_ts); |