aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/wavefront/wavefront_fx.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2007-02-26 09:55:43 -0500
committerJaroslav Kysela <perex@suse.cz>2007-05-11 10:55:43 -0400
commit8ad2da1937168d48a84dcf6d5cc2001c0e4a6992 (patch)
tree6d3f73f922126c339532113a69b368e245d5c05a /sound/isa/wavefront/wavefront_fx.c
parent8f7ba051d2abb3d3bde9b95e47246c60b704d2b4 (diff)
[ALSA] Enable Kconfig options for external firmwares
Some drivers are already ifdefs for enabling external firmwares but not defined in Kconfig. Now they appear as the kernel configs. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/isa/wavefront/wavefront_fx.c')
-rw-r--r--sound/isa/wavefront/wavefront_fx.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c
index 15331ed88194..3a8c0565d676 100644
--- a/sound/isa/wavefront/wavefront_fx.c
+++ b/sound/isa/wavefront/wavefront_fx.c
@@ -35,9 +35,7 @@
35 35
36#define WAIT_IDLE 0xff 36#define WAIT_IDLE 0xff
37 37
38#define FIRMWARE_IN_THE_KERNEL 38#ifdef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
39
40#ifdef FIRMWARE_IN_THE_KERNEL
41#include "yss225.c" 39#include "yss225.c"
42static const struct firmware yss225_registers_firmware = { 40static const struct firmware yss225_registers_firmware = {
43 .data = (u8 *)yss225_registers, 41 .data = (u8 *)yss225_registers,
@@ -266,7 +264,7 @@ snd_wavefront_fx_start (snd_wavefront_t *dev)
266 err = request_firmware(&firmware, "yamaha/yss225_registers.bin", 264 err = request_firmware(&firmware, "yamaha/yss225_registers.bin",
267 dev->card->dev); 265 dev->card->dev);
268 if (err < 0) { 266 if (err < 0) {
269#ifdef FIRMWARE_IN_THE_KERNEL 267#ifdef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
270 firmware = &yss225_registers_firmware; 268 firmware = &yss225_registers_firmware;
271#else 269#else
272 err = -1; 270 err = -1;
@@ -295,7 +293,7 @@ snd_wavefront_fx_start (snd_wavefront_t *dev)
295 err = 0; 293 err = 0;
296 294
297out: 295out:
298#ifdef FIRMWARE_IN_THE_KERNEL 296#ifdef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
299 if (firmware != &yss225_registers_firmware) 297 if (firmware != &yss225_registers_firmware)
300#endif 298#endif
301 release_firmware(firmware); 299 release_firmware(firmware);