Merge branch 'fix/misc' into for-linus

This commit is contained in:
Takashi Iwai 2009-12-23 18:49:55 +01:00
commit 4dc2ec09b8
2 changed files with 2 additions and 16 deletions

View file

@ -5,6 +5,7 @@ config SND_TIMER
config SND_PCM
tristate
select SND_TIMER
select GCD
config SND_HWDEP
tristate

View file

@ -20,6 +20,7 @@
*/
#include <linux/time.h>
#include <linux/gcd.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/timer.h>
@ -28,22 +29,6 @@
* Timer functions
*/
/* Greatest common divisor */
static unsigned long gcd(unsigned long a, unsigned long b)
{
unsigned long r;
if (a < b) {
r = a;
a = b;
b = r;
}
while ((r = a % b) != 0) {
a = b;
b = r;
}
return b;
}
void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream)
{
unsigned long rate, mult, fsize, l, post;