Merge branch 'topic/hda' into fix/hda

6abb3190 · Takashi Iwai · efbeb071 · 19593875 · 6abb3190 · 6abb3190
Commit 6abb3190 authored Jan 31, 2011 by Takashi Iwai
Expand all Show whitespace changes
Inline Side-by-side

Showing with 79 additions and 63 deletions

Documentation/sound/alsa/HD-Audio-Models.txt Documentation/sound/alsa/HD-Audio-Models.txt +1 -0

sound/pci/hda/patch_conexant.c sound/pci/hda/patch_conexant.c +78 -63

No files found.
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -296,6 +296,7 @@ Conexant 5066
 =============
  laptop	Basic Laptop config (default)
  hp-laptop	HP laptops, e g G60
+  asus		Asus K52JU, Lenovo G560
  dell-laptop	Dell laptops
  dell-vostro	Dell Vostro
  olpc-xo-1_5	OLPC XO 1.5

--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c