projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
[deliverable/linux.git]
/
sound
/
oss
/
sys_timer.c
diff --git
a/sound/oss/sys_timer.c
b/sound/oss/sys_timer.c
index 8db6aefe15e4043224a788c2d9bc314e1c2055a9..9f039831114c2f75e11789e061dd505933f87beb 100644
(file)
--- 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;
}
This page took
0.024454 seconds
and
5
git commands to generate.