diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:36 +0200 |
| commit | ed8cc176c9d3f8fbc2ddc18b75362be666e6d328 (patch) | |
| tree | a3a43f4fe421b29a632202aeb506d51f02bc0959 /Documentation/sound/alsa/ALSA-Configuration.txt | |
| parent | 03cece06c41431ab71affc540d587e61894d7572 (diff) | |
| parent | 72cbfd45fac627de4bd38c203baaac40cd26477c (diff) | |
| download | linux-ed8cc176c9d3f8fbc2ddc18b75362be666e6d328.tar.gz | |
Merge branch 'topic/maya44' into for-linus
* topic/maya44:
ALSA: ice1724 - Add ESI Maya44 support
ALSA: ice1724 - Allow spec driver to create own routing controls
ALSA: ice1724 - Add PCI postint to reset sequence
ALSA: ice1724 - Clean up definitions of DMA records
ALSA: ice1724 - Check error in set_rate function
Diffstat (limited to 'Documentation/sound/alsa/ALSA-Configuration.txt')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 8cf17fe43003a3..945de361022f86 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -944,6 +944,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. * Onkyo SE-90PCI * Onkyo SE-200PCI * ESI Juli@ + * ESI Maya44 * Hercules Fortissimo IV * EGO-SYS WaveTerminal 192M @@ -952,7 +953,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. prodigy71xt, prodigy71hifi, prodigyhd2, prodigy192, juli, aureon51, aureon71, universe, ap192, k8x800, phase22, phase28, ms300, av710, se200pci, se90pci, - fortissimo4, sn25p, WT192M + fortissimo4, sn25p, WT192M, maya44 This module supports multiple cards and autoprobe. |