Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[pandora-kernel.git] / sound / isa / Kconfig

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 25347a2..5769a13 100644 (file)
--- 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