diff --git a/[refs] b/[refs] index c6387e4021e3..a55b7d5023db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38135614ddef4de16d5cdf03c2717e88b97dd2ab +refs/heads/master: dc29a3657b52ac687970d81d7194cf4238702124 diff --git a/trunk/kernel/time/clocksource.c b/trunk/kernel/time/clocksource.c index 22504afc0d34..d9ef176c4e09 100644 --- a/trunk/kernel/time/clocksource.c +++ b/trunk/kernel/time/clocksource.c @@ -28,6 +28,7 @@ #include #include #include +#include /* for spin_unlock_irq() using preempt_count() m68k */ /* XXX - Would like a better way for initializing curr_clocksource */ extern struct clocksource clocksource_jiffies;