diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-09 12:28:41 +0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-10 11:32:58 +0400 |
| commit | ee2da99782d717b264d5c309a2084ca85e9a64ff (patch) | |
| tree | 63ef3e9706e4ea08397c23cfe9782c00805927c6 /sound/core/timer.c | |
| parent | 7fc077fba5f8896c6fed3b35c5a10e7fdae82bbe (diff) | |
| download | linux-ee2da99782d717b264d5c309a2084ca85e9a64ff.tar.xz | |
ALSA: remove CONFIG_KMOD from sound
A bunch of things in alsa depend on CONFIG_KMOD,
use CONFIG_MODULES instead where the dependency
is needed at all.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 9d8184a2c2d0..0af337efc64e 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -146,7 +146,7 @@ static struct snd_timer *snd_timer_find(struct snd_timer_id *tid) return NULL; } -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES static void snd_timer_request(struct snd_timer_id *tid) { @@ -259,8 +259,8 @@ int snd_timer_open(struct snd_timer_instance **ti, /* open a master instance */ mutex_lock(®ister_mutex); timer = snd_timer_find(tid); -#ifdef CONFIG_KMOD - if (timer == NULL) { +#ifdef CONFIG_MODULES + if (!timer) { mutex_unlock(®ister_mutex); snd_timer_request(tid); mutex_lock(®ister_mutex); |