Merge branch 'topic/sc6000' into for-linus

[mirror_ubuntu-artful-kernel.git] / sound / isa / Kconfig

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 64129bf220549fdaeb0786bf4250f38f752ef9b7..51a7e3777e17750639faf186befa3a4b4d751520 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -398,16 +398,6 @@ config SND_WAVEFRONT
          To compile this driver as a module, choose M here: the module
          will be called snd-wavefront.
 
-config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
-       bool "In-kernel firmware for Wavefront"
-       depends on SND_WAVEFRONT
-       default y
-       help
-         Say Y here to include the static firmware for FX DSP built in
-         the kernel for the Wavefront driver.  If you choose N here,
-         you need to install the firmware files from the
-         alsa-firmware package.
-
 config SND_MSND_PINNACLE
        tristate "Turtle Beach MultiSound Pinnacle/Fiji driver"
        depends on X86 && EXPERIMENTAL