diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-02-26 09:55:43 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 10:55:43 -0400 |
commit | 8ad2da1937168d48a84dcf6d5cc2001c0e4a6992 (patch) | |
tree | 6d3f73f922126c339532113a69b368e245d5c05a /sound/pci/korg1212 | |
parent | 8f7ba051d2abb3d3bde9b95e47246c60b704d2b4 (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/pci/korg1212')
-rw-r--r-- | sound/pci/korg1212/korg1212.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 21d0899ac382..e2e59cae2f6e 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c | |||
@@ -264,9 +264,7 @@ enum MonitorModeSelector { | |||
264 | #define COMMAND_ACK_DELAY 13 // number of RTC ticks to wait for an acknowledgement | 264 | #define COMMAND_ACK_DELAY 13 // number of RTC ticks to wait for an acknowledgement |
265 | // from the card after sending a command. | 265 | // from the card after sending a command. |
266 | 266 | ||
267 | #define FIRMWARE_IN_THE_KERNEL | 267 | #ifdef CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL |
268 | |||
269 | #ifdef FIRMWARE_IN_THE_KERNEL | ||
270 | #include "korg1212-firmware.h" | 268 | #include "korg1212-firmware.h" |
271 | static const struct firmware static_dsp_code = { | 269 | static const struct firmware static_dsp_code = { |
272 | .data = (u8 *)dspCode, | 270 | .data = (u8 *)dspCode, |
@@ -2345,7 +2343,7 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev * | |||
2345 | err = request_firmware(&dsp_code, "korg/k1212.dsp", &pci->dev); | 2343 | err = request_firmware(&dsp_code, "korg/k1212.dsp", &pci->dev); |
2346 | if (err < 0) { | 2344 | if (err < 0) { |
2347 | release_firmware(dsp_code); | 2345 | release_firmware(dsp_code); |
2348 | #ifdef FIRMWARE_IN_THE_KERNEL | 2346 | #ifdef CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL |
2349 | dsp_code = &static_dsp_code; | 2347 | dsp_code = &static_dsp_code; |
2350 | #else | 2348 | #else |
2351 | snd_printk(KERN_ERR "firmware not available\n"); | 2349 | snd_printk(KERN_ERR "firmware not available\n"); |
@@ -2358,7 +2356,7 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev * | |||
2358 | dsp_code->size, &korg1212->dma_dsp) < 0) { | 2356 | dsp_code->size, &korg1212->dma_dsp) < 0) { |
2359 | snd_printk(KERN_ERR "korg1212: cannot allocate dsp code memory (%zd bytes)\n", dsp_code->size); | 2357 | snd_printk(KERN_ERR "korg1212: cannot allocate dsp code memory (%zd bytes)\n", dsp_code->size); |
2360 | snd_korg1212_free(korg1212); | 2358 | snd_korg1212_free(korg1212); |
2361 | #ifdef FIRMWARE_IN_THE_KERNEL | 2359 | #ifdef CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL |
2362 | if (dsp_code != &static_dsp_code) | 2360 | if (dsp_code != &static_dsp_code) |
2363 | #endif | 2361 | #endif |
2364 | release_firmware(dsp_code); | 2362 | release_firmware(dsp_code); |
@@ -2371,7 +2369,7 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev * | |||
2371 | 2369 | ||
2372 | memcpy(korg1212->dma_dsp.area, dsp_code->data, dsp_code->size); | 2370 | memcpy(korg1212->dma_dsp.area, dsp_code->data, dsp_code->size); |
2373 | 2371 | ||
2374 | #ifdef FIRMWARE_IN_THE_KERNEL | 2372 | #ifdef CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL |
2375 | if (dsp_code != &static_dsp_code) | 2373 | if (dsp_code != &static_dsp_code) |
2376 | #endif | 2374 | #endif |
2377 | release_firmware(dsp_code); | 2375 | release_firmware(dsp_code); |