diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 15:49:04 -0700 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 15:51:11 -0700 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /sound/isa/Kconfig | |
| parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
| parent | d71792ac3d48df6693f7b339e02494efc27036c3 (diff) | |
| download | kernel_goldelico_gta04-751851af7aae9b8bd5a60b3897209081fbc18b2b.zip kernel_goldelico_gta04-751851af7aae9b8bd5a60b3897209081fbc18b2b.tar.gz kernel_goldelico_gta04-751851af7aae9b8bd5a60b3897209081fbc18b2b.tar.bz2 | |
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 25347a2..5769a13 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig @@ -370,15 +370,6 @@ config SND_SB16_CSP coprocessor can do variable tasks like various compression and decompression algorithms. -config SND_SB16_CSP_FIRMWARE_IN_KERNEL - bool "In-kernel firmware for SB16 CSP" - depends on SND_SB16_CSP - default y - help - Say Y here to include the static firmware built in the kernel - for the SB16 CSP controller. If you choose N here, you need - to install the firmware files from the alsa-firmware package. - config SND_SGALAXY tristate "Aztech Sound Galaxy" select SND_AD1848_LIB |