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/sound.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/sound.c')
-rw-r--r-- | sound/core/sound.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/core/sound.c b/sound/core/sound.c index 6c8ab48c689a..09a94953745a 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c | |||
@@ -60,14 +60,14 @@ EXPORT_SYMBOL(snd_ecards_limit); | |||
60 | static struct snd_minor *snd_minors[SNDRV_OS_MINORS]; | 60 | static struct snd_minor *snd_minors[SNDRV_OS_MINORS]; |
61 | static DEFINE_MUTEX(sound_mutex); | 61 | static DEFINE_MUTEX(sound_mutex); |
62 | 62 | ||
63 | #ifdef CONFIG_KMOD | 63 | #ifdef CONFIG_MODULES |
64 | 64 | ||
65 | /** | 65 | /** |
66 | * snd_request_card - try to load the card module | 66 | * snd_request_card - try to load the card module |
67 | * @card: the card number | 67 | * @card: the card number |
68 | * | 68 | * |
69 | * Tries to load the module "snd-card-X" for the given card number | 69 | * Tries to load the module "snd-card-X" for the given card number |
70 | * via KMOD. Returns immediately if already loaded. | 70 | * via request_module. Returns immediately if already loaded. |
71 | */ | 71 | */ |
72 | void snd_request_card(int card) | 72 | void snd_request_card(int card) |
73 | { | 73 | { |
@@ -92,7 +92,7 @@ static void snd_request_other(int minor) | |||
92 | request_module(str); | 92 | request_module(str); |
93 | } | 93 | } |
94 | 94 | ||
95 | #endif /* request_module support */ | 95 | #endif /* modular kernel */ |
96 | 96 | ||
97 | /** | 97 | /** |
98 | * snd_lookup_minor_data - get user data of a registered device | 98 | * 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) | |||
132 | return -ENODEV; | 132 | return -ENODEV; |
133 | mptr = snd_minors[minor]; | 133 | mptr = snd_minors[minor]; |
134 | if (mptr == NULL) { | 134 | if (mptr == NULL) { |
135 | #ifdef CONFIG_KMOD | 135 | #ifdef CONFIG_MODULES |
136 | int dev = SNDRV_MINOR_DEVICE(minor); | 136 | int dev = SNDRV_MINOR_DEVICE(minor); |
137 | if (dev == SNDRV_MINOR_CONTROL) { | 137 | if (dev == SNDRV_MINOR_CONTROL) { |
138 | /* /dev/aloadC? */ | 138 | /* /dev/aloadC? */ |