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 4575ba86591001a40eed357c9e14ac46a945320d..5769a13c1d9577d00dca57cebdcb04b3a1c256f6 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -202,14 +202,10 @@ config SND_SC6000
          To compile this driver as a module, choose M here: the module
          will be called snd-sc6000.
 
-config SND_GUS_SYNTH
-       tristate
-
 config SND_GUSCLASSIC
        tristate "Gravis UltraSound Classic"
        select SND_RAWMIDI
        select SND_PCM
-       select SND_GUS_SYNTH
        help
          Say Y here to include support for Gravis UltraSound Classic
          soundcards.
@@ -222,7 +218,6 @@ config SND_GUSEXTREME
        select SND_HWDEP
        select SND_MPU401_UART
        select SND_PCM
-       select SND_GUS_SYNTH
        help
          Say Y here to include support for Gravis UltraSound Extreme
          soundcards.
@@ -234,7 +229,6 @@ config SND_GUSMAX
        tristate "Gravis UltraSound MAX"
        select SND_RAWMIDI
        select SND_CS4231_LIB
-       select SND_GUS_SYNTH
        help
          Say Y here to include support for Gravis UltraSound MAX
          soundcards.
@@ -247,7 +241,6 @@ config SND_INTERWAVE
        depends on PNP
        select SND_RAWMIDI
        select SND_CS4231_LIB
-       select SND_GUS_SYNTH
        help
          Say Y here to include support for AMD InterWave based
          soundcards (Gravis UltraSound Plug & Play, STB SoundRage32,
@@ -261,7 +254,6 @@ config SND_INTERWAVE_STB
        depends on PNP
        select SND_RAWMIDI
        select SND_CS4231_LIB
-       select SND_GUS_SYNTH
        help
          Say Y here to include support for AMD InterWave based
          soundcards with a TEA6330T bass and treble regulator
@@ -312,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.
@@ -378,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