Merge branch 'topic/lola' into for-linus

diff --combined Documentation/sound/alsa/ALSA-Configuration.txt
index 9822afb,caf3ae2..8975701
--- 1/Documentation/sound/alsa/ALSA-Configuration.txt
--- 2/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@@ -322,7 -322,7 +322,7 @@@ Prior to version 0.9.0rc4 options had 
      "port" needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240)
      or the value stored in the card's EEPROM for cards that have an EEPROM and
      their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can
 -    be choosen freely from the options enumerated above.
 +    be chosen freely from the options enumerated above.
  
      If dma2 is specified and different from dma1, the card will operate in
      full-duplex mode. When dma1=3, only dma2=0 is valid and the only way to
@@@ -356,7 -356,7 +356,7 @@@
      "port" needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240)
      or the value stored in the card's EEPROM for cards that have an EEPROM and
      their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can
 -    be choosen freely from the options enumerated above.
 +    be chosen freely from the options enumerated above.
  
      If dma2 is specified and different from dma1, the card will operate in
      full-duplex mode. When dma1=3, only dma2=0 is valid and the only way to
@@@ -1230,6 -1230,13 +1230,13 @@@
      This module supports multiple cards.
      The driver requires the firmware loader support on kernel.
  
+   Module snd-lola
+   ---------------
+ 
+     Module for Digigram Lola PCI-e boards
+ 
+     This module supports multiple cards.
+ 
    Module snd-lx6464es
    -------------------
  
@@@ -2229,7 -2236,7 +2236,7 @@@ Proc interfaces (/proc/asound
  
  /proc/asound/card#/pcm#[cp]/oss
  -------------------------------
 -  String "erase" - erase all additional informations about OSS applications
 +  String "erase" - erase all additional information about OSS applications
    String "<app_name> <fragments> <fragment_size> [<options>]"
  
     <app_name> - name of application with (higher priority) or without path

diff --combined sound/pci/Kconfig
index 389cd79,92ead69..8d2856f
--- 1/sound/pci/Kconfig
--- 2/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@@ -152,16 -152,10 +152,16 @@@ config SND_AZT332
        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.
  
@@@ -578,13 -572,13 +578,13 @@@ comment "Don't forget to add built-in f
        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.
@@@ -658,6 -652,15 +658,15 @@@ config SND_KORG121
          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