diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-02-26 15:55:43 +0100 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 16:55:43 +0200 |
commit | 8ad2da1937168d48a84dcf6d5cc2001c0e4a6992 (patch) | |
tree | 6d3f73f922126c339532113a69b368e245d5c05a /sound/isa/wavefront/wavefront_fx.c | |
parent | 8f7ba051d2abb3d3bde9b95e47246c60b704d2b4 (diff) | |
download | kernel_samsung_smdk4412-8ad2da1937168d48a84dcf6d5cc2001c0e4a6992.zip kernel_samsung_smdk4412-8ad2da1937168d48a84dcf6d5cc2001c0e4a6992.tar.gz kernel_samsung_smdk4412-8ad2da1937168d48a84dcf6d5cc2001c0e4a6992.tar.bz2 |
[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.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c index 15331ed..3a8c056 100644 --- a/sound/isa/wavefront/wavefront_fx.c +++ b/sound/isa/wavefront/wavefront_fx.c @@ -35,9 +35,7 @@ #define WAIT_IDLE 0xff -#define FIRMWARE_IN_THE_KERNEL - -#ifdef FIRMWARE_IN_THE_KERNEL +#ifdef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL #include "yss225.c" static const struct firmware yss225_registers_firmware = { .data = (u8 *)yss225_registers, @@ -266,7 +264,7 @@ snd_wavefront_fx_start (snd_wavefront_t *dev) err = request_firmware(&firmware, "yamaha/yss225_registers.bin", dev->card->dev); if (err < 0) { -#ifdef FIRMWARE_IN_THE_KERNEL +#ifdef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL firmware = &yss225_registers_firmware; #else err = -1; @@ -295,7 +293,7 @@ snd_wavefront_fx_start (snd_wavefront_t *dev) err = 0; out: -#ifdef FIRMWARE_IN_THE_KERNEL +#ifdef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL if (firmware != &yss225_registers_firmware) #endif release_firmware(firmware); |