Merge branch 'drm-next-4.8' of git://people.freedesktop.org/~agd5f/linux into drm...

[mirror_ubuntu-artful-kernel.git] / sound / oss / sys_timer.c

diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c
index 2226dda0eff0d9e2daf3f907877f20930f4f57ff..d17019d25b994526251a7fc8d9b088b0fecc109c 100644 (file)
--- a/sound/oss/sys_timer.c
+++ b/sound/oss/sys_timer.c
@@ -19,7 +19,7 @@
 #include "sound_config.h"
 
 static volatile int opened, tmr_running;
-static volatile time_t tmr_offs, tmr_ctr;
+static volatile unsigned int tmr_offs, tmr_ctr;
 static volatile unsigned long ticks_offs;
 static volatile int curr_tempo, curr_timebase;
 static volatile unsigned long curr_ticks;