diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-21 04:59:12 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-21 04:59:12 -0400 |
| commit | 47166281d2dc9daf7da9a5ad88491ae94366e852 (patch) | |
| tree | 84cf6bb94284a411a68cb0f945bb8d6cf92a67c0 /Documentation/sound | |
| parent | 0b6306f69f1857f8883cbd81a5f60393db6a08fc (diff) | |
| parent | b1a914690c581f8f88b897d83a79b1c6eaf494c9 (diff) | |
Merge branch 'topic/hda' into for-linus
* topic/hda:
ALSA: hda - Add model=6530g option
ALSA: hda - Acer Inspire 6530G model for Realtek ALC888
ALSA: HDA - Correct trivial typos in comments.
ALSA: HDA - Name-fixes in code (tagra/targa)
ALSA: HDA - Add pci-quirk for MSI MS-7350 motherboard.
ALSA: hda - Fix memory leak at codec creation
Diffstat (limited to 'Documentation/sound')
| -rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index de8e10a94103..0d8d23581c44 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
| @@ -139,6 +139,7 @@ ALC883/888 | |||
| 139 | acer Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc) | 139 | acer Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc) |
| 140 | acer-aspire Acer Aspire 9810 | 140 | acer-aspire Acer Aspire 9810 |
| 141 | acer-aspire-4930g Acer Aspire 4930G | 141 | acer-aspire-4930g Acer Aspire 4930G |
| 142 | acer-aspire-6530g Acer Aspire 6530G | ||
| 142 | acer-aspire-8930g Acer Aspire 8930G | 143 | acer-aspire-8930g Acer Aspire 8930G |
| 143 | medion Medion Laptops | 144 | medion Medion Laptops |
| 144 | medion-md2 Medion MD2 | 145 | medion-md2 Medion MD2 |