diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2007-03-12 03:30:16 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 10:55:46 -0400 |
commit | badec46ddf7c2d1cb0b944332746828c48debe40 (patch) | |
tree | 73be663a5725200e753c05d8562f9e76887f3990 /sound/isa/Kconfig | |
parent | 4d02031fe25c01eaa946a25e2052dd8e706edfca (diff) |
[ALSA] Kconfig: fix FW_LOADER dependencies
Move the FW_LOADER dependencies out of the *_FIRMWARE_IN_KERNEL entries
because these drivers use the firmware loader regardless of whether
there is an in-kernel firmware image.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/isa/Kconfig')
-rw-r--r-- | sound/isa/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index c855e350789a..992e8c32508a 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig | |||
@@ -358,6 +358,7 @@ config SND_SBAWE | |||
358 | config SND_SB16_CSP | 358 | config SND_SB16_CSP |
359 | bool "Sound Blaster 16/AWE CSP support" | 359 | bool "Sound Blaster 16/AWE CSP support" |
360 | depends on (SND_SB16 || SND_SBAWE) && (BROKEN || !PPC) | 360 | depends on (SND_SB16 || SND_SBAWE) && (BROKEN || !PPC) |
361 | select FW_LOADER | ||
361 | help | 362 | help |
362 | Say Y here to include support for the CSP core. This special | 363 | Say Y here to include support for the CSP core. This special |
363 | coprocessor can do variable tasks like various compression and | 364 | coprocessor can do variable tasks like various compression and |
@@ -366,7 +367,6 @@ config SND_SB16_CSP | |||
366 | config SND_SB16_CSP_FIRMWARE_IN_KERNEL | 367 | config SND_SB16_CSP_FIRMWARE_IN_KERNEL |
367 | bool "In-kernel firmware for SB16 CSP" | 368 | bool "In-kernel firmware for SB16 CSP" |
368 | depends on SND_SB16_CSP | 369 | depends on SND_SB16_CSP |
369 | select FW_LOADER | ||
370 | default y | 370 | default y |
371 | help | 371 | help |
372 | Say Y here to include the static firmware built in the kernel | 372 | Say Y here to include the static firmware built in the kernel |
@@ -400,6 +400,7 @@ config SND_SSCAPE | |||
400 | config SND_WAVEFRONT | 400 | config SND_WAVEFRONT |
401 | tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)" | 401 | tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)" |
402 | depends on SND | 402 | depends on SND |
403 | select FW_LOADER | ||
403 | select SND_OPL3_LIB | 404 | select SND_OPL3_LIB |
404 | select SND_MPU401_UART | 405 | select SND_MPU401_UART |
405 | select SND_CS4231_LIB | 406 | select SND_CS4231_LIB |
@@ -413,7 +414,6 @@ config SND_WAVEFRONT | |||
413 | config SND_WAVEFRONT_FIRMWARE_IN_KERNEL | 414 | config SND_WAVEFRONT_FIRMWARE_IN_KERNEL |
414 | bool "In-kernel firmware for Wavefront" | 415 | bool "In-kernel firmware for Wavefront" |
415 | depends on SND_WAVEFRONT | 416 | depends on SND_WAVEFRONT |
416 | select FW_LOADER | ||
417 | default y | 417 | default y |
418 | help | 418 | help |
419 | Say Y here to include the static firmware built in the kernel | 419 | Say Y here to include the static firmware built in the kernel |