Commit 4dc2ec09 authored by Takashi Iwai's avatar Takashi Iwai

Merge branch 'fix/misc' into for-linus

parents 1f26cb92 a9605391
...@@ -5,6 +5,7 @@ config SND_TIMER ...@@ -5,6 +5,7 @@ config SND_TIMER
config SND_PCM config SND_PCM
tristate tristate
select SND_TIMER select SND_TIMER
select GCD
config SND_HWDEP config SND_HWDEP
tristate tristate
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
*/ */
#include <linux/time.h> #include <linux/time.h>
#include <linux/gcd.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/timer.h> #include <sound/timer.h>
...@@ -28,22 +29,6 @@ ...@@ -28,22 +29,6 @@
* Timer functions * 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) void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream)
{ {
unsigned long rate, mult, fsize, l, post; unsigned long rate, mult, fsize, l, post;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment