[ALSA] hda: More subsystem id BIOS changes

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

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index b80b97f7a49ab641593c854c4000784e03fafadf..2c6486c23a52f718e87f78ff8622da75d72fe386 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -170,14 +170,14 @@ config SND_CA0106
          will be called snd-ca0106.
 
 config SND_CMIPCI
-       tristate "C-Media 8738, 8338"
+       tristate "C-Media 8338, 8738, 8768, 8770"
        depends on SND
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_PCM
        help
-         If you want to use soundcards based on C-Media CMI8338 or CMI8738
-         chips, say Y here and read
+         If you want to use soundcards based on C-Media CMI8338, CMI8738,
+         CMI8768 or CMI8770 chips, say Y here and read
          <file:Documentation/sound/alsa/CMIPCI.txt>.
 
          To compile this driver as a module, choose M here: the module
@@ -507,7 +507,7 @@ config SND_HDA_HWDEP
        help
          Say Y here to build a hwdep interface for HD-audio driver.
          This interface can be used for out-of-bound communication
-         with codesc for debugging purposes.
+         with codecs for debugging purposes.
 
 config SND_HDA_CODEC_REALTEK
        bool "Build Realtek HD-audio codec support"
@@ -581,6 +581,22 @@ config SND_HDA_GENERIC
          Say Y here to enable the generic HD-audio codec parser
          in snd-hda-intel driver.
 
+config SND_HDA_POWER_SAVE
+       bool "Aggressive power-saving on HD-audio"
+       depends on SND_HDA_INTEL && EXPERIMENTAL
+       help
+         Say Y here to enable more aggressive power-saving mode on
+         HD-audio driver.  The power-saving timeout can be configured
+         via power_save option or over sysfs on-the-fly.
+
+config SND_HDA_POWER_SAVE_DEFAULT
+       int "Default time-out for HD-audio power-save mode"
+       depends on SND_HDA_POWER_SAVE
+       default 0
+       help
+         The default time-out value in seconds for HD-audio automatic
+         power-save mode.  0 means to disable the power-save mode.
+
 config SND_HDSP
        tristate "RME Hammerfall DSP Audio"
        depends on SND
@@ -880,4 +896,11 @@ config SND_AC97_POWER_SAVE
          snd-ac97-codec driver.  You can toggle it dynamically over
          sysfs, too.
 
+config SND_AC97_POWER_SAVE_DEFAULT
+       int "Default time-out for AC97 power-save mode"
+       depends on SND_AC97_POWER_SAVE
+       default 0
+         The default time-out value in seconds for AC97 automatic
+         power-save mode.  0 means to disable the power-save mode.
+
 endmenu