diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-01 11:11:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-01 11:11:07 +0100 |
| commit | e87a3dd33eab30b4db539500064a9584867e4f2c (patch) | |
| tree | 2f7ad16e46ae30518ff63bb5391b63f7f7cc74dd /sound/oss | |
| parent | b14f5de731ae657d498d18d713c6431bfbeefb4b (diff) | |
| parent | 3d00941371a765779c4e3509214c7e5793cce1fe (diff) | |
| download | kernel_samsung_espresso10-e87a3dd33eab30b4db539500064a9584867e4f2c.zip kernel_samsung_espresso10-e87a3dd33eab30b4db539500064a9584867e4f2c.tar.gz kernel_samsung_espresso10-e87a3dd33eab30b4db539500064a9584867e4f2c.tar.bz2 | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/swarm_cs4297a.c | 3 | ||||
| -rw-r--r-- | sound/oss/sys_timer.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c index 1edab7b..3136c88 100644 --- a/sound/oss/swarm_cs4297a.c +++ b/sound/oss/swarm_cs4297a.c @@ -110,9 +110,6 @@ static void start_adc(struct cs4297a_state *s); // rather than 64k as some of the games work more responsively. // log base 2( buff sz = 32k). -//static unsigned long defaultorder = 3; -//MODULE_PARM(defaultorder, "i"); - // // Turn on/off debugging compilation by commenting out "#define CSDEBUG" // diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c index 1075344..8db6aef 100644 --- a/sound/oss/sys_timer.c +++ b/sound/oss/sys_timer.c @@ -100,9 +100,6 @@ def_tmr_open(int dev, int mode) curr_tempo = 60; curr_timebase = 100; opened = 1; - - ; - { def_tmr.expires = (1) + jiffies; add_timer(&def_tmr); |