diff options
| author | Alexander Graf <agraf@suse.de> | 2012-10-31 13:36:18 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-10-31 13:36:18 +0100 |
| commit | 0588000eac9ba4178cebade437da3b28e8fad48f (patch) | |
| tree | 697e514a0a0193f17a54f372dd18c5cd3927e154 /sound/oss/sys_timer.c | |
| parent | 8b5869ad85f703ffeb25e656eab826f6b85b984c (diff) | |
| parent | 81c52c56e2b43589091ee29038bcf793d3f184ab (diff) | |
Merge commit 'origin/queue' into for-queue
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
Diffstat (limited to 'sound/oss/sys_timer.c')
| -rw-r--r-- | sound/oss/sys_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c index 8db6aefe15e..9f039831114 100644 --- a/sound/oss/sys_timer.c +++ b/sound/oss/sys_timer.c @@ -57,7 +57,7 @@ poll_def_tmr(unsigned long dummy) { def_tmr.expires = (1) + jiffies; add_timer(&def_tmr); - }; + } if (tmr_running) { @@ -103,7 +103,7 @@ def_tmr_open(int dev, int mode) { def_tmr.expires = (1) + jiffies; add_timer(&def_tmr); - }; + } return 0; } |