Merge branch 'topic/lola' into for-linus

[pandora-kernel.git] / sound / pci / Kconfig

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 9823d59..8d2856f 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -152,10 +152,16 @@ config SND_AZT3328
        select SND_MPU401_UART
        select SND_PCM
        select SND_RAWMIDI
+       select SND_AC97_CODEC
        help
          Say Y here to include support for Aztech AZF3328 (PCI168)
          soundcards.
 
+         Supported features: AC97-"conformant" mixer, MPU401/OPL3, analog I/O
+         (16bit/8bit, many sample rates [<= 66.2kHz], NO hardware mixing),
+         Digital Enhanced Game Port, 1.024MHz multimedia sequencer timer,
+         ext. codec (I2S port), onboard amp (4W/4Ohms/ch), suspend/resume.
+
          To compile this driver as a module, choose M here: the module
          will be called snd-azt3328.
 
@@ -572,13 +578,13 @@ comment "Don't forget to add built-in firmwares for HDSP driver"
        depends on SND_HDSP=y
 
 config SND_HDSPM
-       tristate "RME Hammerfall DSP MADI"
+       tristate "RME Hammerfall DSP MADI/RayDAT/AIO"
        select SND_HWDEP
        select SND_RAWMIDI
        select SND_PCM
        help
-         Say Y here to include support for RME Hammerfall DSP MADI
-         soundcards.
+         Say Y here to include support for RME Hammerfall DSP MADI,
+         RayDAT and AIO soundcards.
 
          To compile this driver as a module, choose M here: the module
          will be called snd-hdspm.
@@ -652,6 +658,15 @@ config SND_KORG1212
          To compile this driver as a module, choose M here: the module
          will be called snd-korg1212.
 
+config SND_LOLA
+       tristate "Digigram Lola"
+       select SND_PCM
+       help
+         Say Y to include support for Digigram Lola boards.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-lola.
+
 config SND_LX6464ES
        tristate "Digigram LX6464ES"
        select SND_PCM