ALSA: hda: add Intel DSP configuration / probe code

[linux-2.6-block.git] / sound / pci / hda / Kconfig

diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index dae47a45b2b8bdabef5d92fe698f72fc80ecd218..bd48335d09d74f1d0fe22a98a441c362e6bbb11f 100644 (file)
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -12,7 +12,7 @@ config SND_HDA_INTEL
        tristate "HD Audio PCI"
        depends on SND_PCI
        select SND_HDA
-       select SND_INTEL_NHLT if ACPI
+       select SND_INTEL_DSP_CONFIG
        help
          Say Y here to include support for Intel "High Definition
          Audio" (Azalia) and its compatible devices.
@@ -23,15 +23,6 @@ config SND_HDA_INTEL
          To compile this driver as a module, choose M here: the module
          will be called snd-hda-intel.
 
-config SND_HDA_INTEL_DETECT_DMIC
-       bool "DMIC detection and probe abort"
-       depends on SND_HDA_INTEL
-       help
-         Say Y to detect digital microphones on SKL+ devices. DMICs
-         cannot be handled by the HDaudio legacy driver and are
-         currently only supported by the SOF driver.
-         If unsure say N.
-
 config SND_HDA_TEGRA
        tristate "NVIDIA Tegra HD Audio"
        depends on ARCH_TEGRA