diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-09 04:28:41 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-10 03:32:58 -0400 |
commit | ee2da99782d717b264d5c309a2084ca85e9a64ff (patch) | |
tree | 63ef3e9706e4ea08397c23cfe9782c00805927c6 /sound/core/timer.c | |
parent | 7fc077fba5f8896c6fed3b35c5a10e7fdae82bbe (diff) |
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) | |||
146 | return NULL; | 146 | return NULL; |
147 | } | 147 | } |
148 | 148 | ||
149 | #ifdef CONFIG_KMOD | 149 | #ifdef CONFIG_MODULES |
150 | 150 | ||
151 | static void snd_timer_request(struct snd_timer_id *tid) | 151 | static void snd_timer_request(struct snd_timer_id *tid) |
152 | { | 152 | { |
@@ -259,8 +259,8 @@ int snd_timer_open(struct snd_timer_instance **ti, | |||
259 | /* open a master instance */ | 259 | /* open a master instance */ |
260 | mutex_lock(®ister_mutex); | 260 | mutex_lock(®ister_mutex); |
261 | timer = snd_timer_find(tid); | 261 | timer = snd_timer_find(tid); |
262 | #ifdef CONFIG_KMOD | 262 | #ifdef CONFIG_MODULES |
263 | if (timer == NULL) { | 263 | if (!timer) { |
264 | mutex_unlock(®ister_mutex); | 264 | mutex_unlock(®ister_mutex); |
265 | snd_timer_request(tid); | 265 | snd_timer_request(tid); |
266 | mutex_lock(®ister_mutex); | 266 | mutex_lock(®ister_mutex); |