---

yaml --- r: 335508 b: refs/heads/master c: 5c0ee94 h: refs/heads/master v: v3
git-mirror · Nov 5, 2012 · a86020d · a86020d
1 parent 4f40476
commit a86020d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00e17f767e3e8d42b83a12af3ed16e3129e4feb0
+refs/heads/master: 5c0ee9497b33cde3e57460efe4f73313dc0b57a3
diff --git a/trunk/sound/pci/es1968.c b/trunk/sound/pci/es1968.c
@@ -2655,6 +2655,8 @@ static struct ess_device_list pm_whitelist[] __devinitdata = {
 	{ TYPE_MAESTRO2E, 0x1179 },
 	{ TYPE_MAESTRO2E, 0x14c0 },	/* HP omnibook 4150 */
 	{ TYPE_MAESTRO2E, 0x1558 },
+	{ TYPE_MAESTRO2E, 0x125d },	/* a PCI card, e.g. Terratec DMX */
+	{ TYPE_MAESTRO2, 0x125d },	/* a PCI card, e.g. SF64-PCE2 */
 };
 
 static struct ess_device_list mpu_blacklist[] __devinitdata = {