---

yaml --- r: 206464 b: refs/heads/master c: d4a86d8 h: refs/heads/master v: v3
git-mirror · Jun 23, 2010 · 9ee17b6 · 9ee17b6
1 parent f6fd6bf
commit 9ee17b6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1eb57f47b7f524c13112c891e87fb1f51029fd1
+refs/heads/master: d4a86d81944d3cccb3f4a309230e835823a61252
diff --git a/trunk/Documentation/sound/alsa/HD-Audio-Models.txt b/trunk/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -114,6 +114,11 @@ ALC662/663/272
   samsung-nc10	Samsung NC10 mini notebook
   auto		auto-config reading BIOS (default)
 
+ALC680
+======
+  base		Base model (ASUS NX90)
+  auto		auto-config reading BIOS (default)
+
 ALC882/883/885/888/889
 ======================
   3stack-dig	3-jack with SPDIF I/O

diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c
@@ -256,6 +256,13 @@ enum {
 	ALC882_MODEL_LAST,
 };
 
+/* ALC680 models */
+enum {
+	ALC680_BASE,
+	ALC680_AUTO,
+	ALC680_MODEL_LAST,
+};
+
 /* for GPIO Poll */
 #define GPIO_MASK	0x03
 
@@ -18997,7 +19004,8 @@ static void alc680_auto_init(struct hda_codec *codec)
  * configuration and preset
  */
 static const char *alc680_models[ALC680_MODEL_LAST] = {
-	[ALC680_BASE]		= "alc680_base",
+	[ALC680_BASE]		= "base",
+	[ALC680_AUTO]		= "auto",
 };
 
 static struct snd_pci_quirk alc680_cfg_tbl[] = {