diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:19 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:19 -0500 |
| commit | c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (patch) | |
| tree | ebb44130d6925943c3573807863ada4c93f0bd49 /Documentation | |
| parent | e38302f78284e3e80ffc2eef54001fce7d183bd4 (diff) | |
| parent | 80c678526d7da73bde4d46a4622449c2b3c88409 (diff) | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 37c6aad5e590..16ae4300c747 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
| @@ -149,7 +149,6 @@ ALC882/883/885/888/889 | |||
| 149 | acer-aspire-7730g Acer Aspire 7730G | 149 | acer-aspire-7730g Acer Aspire 7730G |
| 150 | acer-aspire-8930g Acer Aspire 8930G | 150 | acer-aspire-8930g Acer Aspire 8930G |
| 151 | medion Medion Laptops | 151 | medion Medion Laptops |
| 152 | medion-md2 Medion MD2 | ||
| 153 | targa-dig Targa/MSI | 152 | targa-dig Targa/MSI |
| 154 | targa-2ch-dig Targa/MSI with 2-channel | 153 | targa-2ch-dig Targa/MSI with 2-channel |
| 155 | targa-8ch-dig Targa/MSI with 8-channel (MSI GX620) | 154 | targa-8ch-dig Targa/MSI with 8-channel (MSI GX620) |