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

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / sound / isa / Kconfig

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index d649a0e966daec820f2670b8fa210f7c7dadab81..5769a13c1d9577d00dca57cebdcb04b3a1c256f6 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -304,7 +304,7 @@ config SND_OPTI93X
        tristate "OPTi 82C93x"
        select SND_OPL3_LIB
        select SND_MPU401_UART
-       select SND_PCM
+       select SND_CS4231_LIB
        help
          Say Y here to include support for soundcards based on Opti
          82C93x chips.
@@ -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