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/isa/sb | |
| 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/isa/sb')
| -rw-r--r-- | sound/isa/sb/sb16_csp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c index 3d9d7e0107ca..ef71e50744e9 100644 --- a/sound/isa/sb/sb16_csp.c +++ b/sound/isa/sb/sb16_csp.c | |||
| @@ -690,9 +690,7 @@ static int snd_sb_csp_load_user(struct snd_sb_csp * p, const unsigned char __use | |||
| 690 | return err; | 690 | return err; |
| 691 | } | 691 | } |
| 692 | 692 | ||
| 693 | #define FIRMWARE_IN_THE_KERNEL | 693 | #ifdef CONFIG_SND_SB16_CSP_FIRMWARE_IN_KERNEL |
| 694 | |||
| 695 | #ifdef FIRMWARE_IN_THE_KERNEL | ||
| 696 | #include "sb16_csp_codecs.h" | 694 | #include "sb16_csp_codecs.h" |
| 697 | 695 | ||
| 698 | static const struct firmware snd_sb_csp_static_programs[] = { | 696 | static const struct firmware snd_sb_csp_static_programs[] = { |
| @@ -724,7 +722,7 @@ static int snd_sb_csp_firmware_load(struct snd_sb_csp *p, int index, int flags) | |||
| 724 | if (err >= 0) | 722 | if (err >= 0) |
| 725 | p->csp_programs[index] = program; | 723 | p->csp_programs[index] = program; |
| 726 | else { | 724 | else { |
| 727 | #ifdef FIRMWARE_IN_THE_KERNEL | 725 | #ifdef CONFIG_SND_SB16_CSP_FIRMWARE_IN_KERNEL |
| 728 | program = &snd_sb_csp_static_programs[index]; | 726 | program = &snd_sb_csp_static_programs[index]; |
| 729 | #else | 727 | #else |
| 730 | return err; | 728 | return err; |
