diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 17:12:14 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 17:12:14 +0100 |
commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /sound/oss/vidc.c | |
parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
download | kernel_goldelico_gta04-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.zip kernel_goldelico_gta04-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.tar.gz kernel_goldelico_gta04-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.tar.bz2 |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'sound/oss/vidc.c')
-rw-r--r-- | sound/oss/vidc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index f0e0caa..12ba28e 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c @@ -227,7 +227,7 @@ static int vidc_audio_set_speed(int dev, int rate) } else { /*printk("VIDC: internal %d %d %d\n", rate, rate_int, hwrate);*/ hwctrl=0x00000003; - /* Allow rougly 0.4% tolerance */ + /* Allow roughly 0.4% tolerance */ if (diff_int > (rate/256)) rate=rate_int; } |