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>
This commit is contained in:
Johannes Berg
2008-07-09 10:28:41 +02:00
committed by Jaroslav Kysela
parent 7fc077fba5
commit ee2da99782
7 changed files with 11 additions and 17 deletions

View File

@@ -60,14 +60,14 @@ EXPORT_SYMBOL(snd_ecards_limit);
static struct snd_minor *snd_minors[SNDRV_OS_MINORS];
static DEFINE_MUTEX(sound_mutex);
#ifdef CONFIG_KMOD
#ifdef CONFIG_MODULES
/**
* snd_request_card - try to load the card module
* @card: the card number
*
* Tries to load the module "snd-card-X" for the given card number
* via KMOD. Returns immediately if already loaded.
* via request_module. Returns immediately if already loaded.
*/
void snd_request_card(int card)
{
@@ -92,7 +92,7 @@ static void snd_request_other(int minor)
request_module(str);
}
#endif /* request_module support */
#endif /* modular kernel */
/**
* snd_lookup_minor_data - get user data of a registered device
@@ -132,7 +132,7 @@ static int snd_open(struct inode *inode, struct file *file)
return -ENODEV;
mptr = snd_minors[minor];
if (mptr == NULL) {
#ifdef CONFIG_KMOD
#ifdef CONFIG_MODULES
int dev = SNDRV_MINOR_DEVICE(minor);
if (dev == SNDRV_MINOR_CONTROL) {
/* /dev/aloadC? */