diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-07-25 17:01:14 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-07-25 17:01:14 +0200 |
| commit | cf81d6b583444cb6f5e656f050e43413b236354e (patch) | |
| tree | 646567ef019e0bbc5cc9db0e26c464a9fc239481 /sound/oss/sound_timer.c | |
| parent | 76df52969711ae3725a98f26fbbc6a349803dcbf (diff) | |
| parent | 275353bb684ecfeb42f7a353fead81d43a01c519 (diff) | |
Merge branch 'for-next' into for-linus
Merged 4.8 changes.
Diffstat (limited to 'sound/oss/sound_timer.c')
| -rw-r--r-- | sound/oss/sound_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/sound_timer.c b/sound/oss/sound_timer.c index 8021c85f076d..3a444a6f10eb 100644 --- a/sound/oss/sound_timer.c +++ b/sound/oss/sound_timer.c @@ -17,7 +17,7 @@ #include "sound_config.h" static volatile int initialized, 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; |