diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:49:04 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:51:11 -0400 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /sound/isa/Kconfig | |
| parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
| parent | d71792ac3d48df6693f7b339e02494efc27036c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'sound/isa/Kconfig')
| -rw-r--r-- | sound/isa/Kconfig | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index 25347a25d63c..5769a13c1d95 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig | |||
| @@ -370,15 +370,6 @@ config SND_SB16_CSP | |||
| 370 | coprocessor can do variable tasks like various compression and | 370 | coprocessor can do variable tasks like various compression and |
| 371 | decompression algorithms. | 371 | decompression algorithms. |
| 372 | 372 | ||
| 373 | config SND_SB16_CSP_FIRMWARE_IN_KERNEL | ||
| 374 | bool "In-kernel firmware for SB16 CSP" | ||
| 375 | depends on SND_SB16_CSP | ||
| 376 | default y | ||
| 377 | help | ||
| 378 | Say Y here to include the static firmware built in the kernel | ||
| 379 | for the SB16 CSP controller. If you choose N here, you need | ||
| 380 | to install the firmware files from the alsa-firmware package. | ||
| 381 | |||
| 382 | config SND_SGALAXY | 373 | config SND_SGALAXY |
| 383 | tristate "Aztech Sound Galaxy" | 374 | tristate "Aztech Sound Galaxy" |
| 384 | select SND_AD1848_LIB | 375 | select SND_AD1848_LIB |