ALSA: hda - Fix resume of GPIO unsol event for STAC/IDT

[deliverable/linux.git] / sound / pci / Kconfig

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 8fe5dac3942824a8c9274eb1ce0dea74e80f8e99..7003711f4fcc4165d6e5a24f7fb3be2c55ea91cb 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -517,6 +517,14 @@ config SND_HDA_HWDEP
          This interface can be used for out-of-band communication
          with codecs for debugging purposes.
 
+config SND_HDA_INPUT_BEEP
+       bool "Support digital beep via input layer"
+       depends on SND_HDA_INTEL
+       depends on INPUT=y || INPUT=SND_HDA_INTEL
+       help
+         Say Y here to build a digital beep interface for HD-audio
+         driver. This interface is used to generate digital beeps.
+
 config SND_HDA_CODEC_REALTEK
        bool "Build Realtek HD-audio codec support"
        depends on SND_HDA_INTEL
@@ -557,6 +565,14 @@ config SND_HDA_CODEC_ATIHDMI
          Say Y here to include ATI HDMI HD-audio codec support in
          snd-hda-intel driver, such as ATI RS600 HDMI.
 
+config SND_HDA_CODEC_NVHDMI
+       bool "Build NVIDIA HDMI HD-audio codec support"
+       depends on SND_HDA_INTEL
+       default y
+       help
+         Say Y here to include NVIDIA HDMI HD-audio codec support in
+         snd-hda-intel driver, such as NVIDIA MCP78 HDMI.
+
 config SND_HDA_CODEC_CONEXANT
        bool "Build Conexant HD-audio codec support"
        depends on SND_HDA_INTEL
@@ -649,8 +665,9 @@ config SND_ICE1712
 
          Currently supported hardware is: M-Audio Delta 1010(LT),
          DiO 2496, 66, 44, 410, Audiophile 24/96; Digigram VX442;
-         TerraTec EWX 24/96, EWS 88MT, 88D, DMX 6Fire, Phase 88;
-         Hoontech SoundTrack DSP 24/Value/Media7.1; Event EZ8.
+         TerraTec EWX 24/96, EWS 88MT/D, DMX 6Fire, Phase 88;
+         Hoontech SoundTrack DSP 24/Value/Media7.1; Event EZ8;
+         Lionstracs Mediastation, Terrasoniq TS 88.
 
          To compile this driver as a module, choose M here: the module
          will be called snd-ice1712.
@@ -665,9 +682,12 @@ config SND_ICE1724
          ICE/VT1724/1720 (Envy24HT/PT) chips.
 
          Currently supported hardware is: AMP AUDIO2000; M-Audio
-         Revolution 7.1; TerraTec Aureon 5.1 Sky, 7.1 Space/Universe;
-         AudioTrak Prodigy 7.1; Pontis MS300; Albatron K8X800 Pro II;
-         Chaintech ZNF3-150/250.
+         Revolution 5.1, 7.1, Audiophile 192; TerraTec Aureon 5.1 Sky,
+         7.1 Space/Universe, Phase 22/28; Onkyo SE-90PCI, SE-200PCI;
+         AudioTrak Prodigy 192, 7.1 (HIFI/LT/XT), HD2; Hercules
+         Fortissimo IV; ESI Juli@; Pontis MS300; EGO-SYS WaveTerminal
+         192M; Albatron K8X800 Pro II; Chaintech ZNF3-150/250, 9CJS,
+         AV-710; Shuttle SN25P.
 
          To compile this driver as a module, choose M here: the module
          will be called snd-ice1724.
@@ -696,7 +716,6 @@ config SND_INTEL8X0M
 
 config SND_KORG1212
        tristate "Korg 1212 IO"
-       select FW_LOADER if !SND_KORG1212_FIRMWARE_IN_KERNEL
        select SND_PCM
        help
          Say Y here to include support for Korg 1212IO soundcards.
@@ -704,18 +723,8 @@ config SND_KORG1212
          To compile this driver as a module, choose M here: the module
          will be called snd-korg1212.
 
-config SND_KORG1212_FIRMWARE_IN_KERNEL
-       bool "In-kernel firmware for Korg1212 driver"
-       depends on SND_KORG1212
-       default y
-       help
-         Say Y here to include the static firmware built in the kernel
-         for the Korg1212 driver.  If you choose N here, you need to
-         install the firmware files from the alsa-firmware package.
-
 config SND_MAESTRO3
        tristate "ESS Allegro/Maestro3"
-       select FW_LOADER if !SND_MAESTRO3_FIRMWARE_IN_KERNEL
        select SND_AC97_CODEC
        help
          Say Y here to include support for soundcards based on ESS Maestro 3
@@ -724,15 +733,6 @@ config SND_MAESTRO3
          To compile this driver as a module, choose M here: the module
          will be called snd-maestro3.
 
-config SND_MAESTRO3_FIRMWARE_IN_KERNEL
-       bool "In-kernel firmware for Maestro3 driver"
-       depends on SND_MAESTRO3
-       default y
-       help
-         Say Y here to include the static firmware built in the kernel
-         for the Maestro3 driver.  If you choose N here, you need to
-         install the firmware files from the alsa-firmware package.
-
 config SND_MIXART
        tristate "Digigram miXart"
        select SND_HWDEP
@@ -865,7 +865,8 @@ config SND_VIRTUOSO
        select SND_OXYGEN_LIB
        help
          Say Y here to include support for sound cards based on the
-         Asus AV100/AV200 chips, i.e., Xonar D2, DX and D2X.
+         Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X and
+         HDAV1.3 (Deluxe).
 
          To compile this driver as a module, choose M here: the module
          will be called snd-virtuoso.
@@ -881,7 +882,6 @@ config SND_VX222
 
 config SND_YMFPCI
        tristate "Yamaha YMF724/740/744/754"
-       select FW_LOADER if !SND_YMFPCI_FIRMWARE_IN_KERNEL
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_AC97_CODEC
@@ -892,13 +892,4 @@ config SND_YMFPCI
          To compile this driver as a module, choose M here: the module
          will be called snd-ymfpci.
 
-config SND_YMFPCI_FIRMWARE_IN_KERNEL
-       bool "In-kernel firmware for YMFPCI driver"
-       depends on SND_YMFPCI
-       default y
-       help
-         Say Y here to include the static firmware built in the kernel
-         for the YMFPCI driver.  If you choose N here, you need to
-         install the firmware files from the alsa-firmware package.
-
 endif  # SND_PCI