diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-23 18:49:55 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-23 18:49:55 +0100 |
| commit | 4dc2ec09b80b32b54821f1776959740283efa5a2 (patch) | |
| tree | 9920d7999e99107a5c74e0ff7de7a0b5a7526f7b | |
| parent | 1f26cb92a28541da1c9b27571e40b08333595773 (diff) | |
| parent | a9605391cfab2bf9a73e51faac5147622f73c6d5 (diff) | |
| download | linux-4dc2ec09b80b32b54821f1776959740283efa5a2.tar.gz linux-4dc2ec09b80b32b54821f1776959740283efa5a2.tar.bz2 linux-4dc2ec09b80b32b54821f1776959740283efa5a2.zip | |
Merge branch 'fix/misc' into for-linus
| -rw-r--r-- | sound/core/Kconfig | 1 | ||||
| -rw-r--r-- | sound/core/pcm_timer.c | 17 |
2 files changed, 2 insertions, 16 deletions
diff --git a/sound/core/Kconfig b/sound/core/Kconfig index c15682a2f9db..475455c76610 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig @@ -5,6 +5,7 @@ config SND_TIMER config SND_PCM tristate select SND_TIMER + select GCD config SND_HWDEP tristate diff --git a/sound/core/pcm_timer.c b/sound/core/pcm_timer.c index ca8068b63d6c..b01d9481d632 100644 --- a/sound/core/pcm_timer.c +++ b/sound/core/pcm_timer.c @@ -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; |