From cc26ca9637021af47bb0bfe80031fd7b78a3dabd Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Thu, 19 May 2011 18:48:27 +0400
Subject: [PATCH] --- yaml --- r: 248193 b: refs/heads/master c:
 df1fe13289eca445b77471c204408bec67313be3 h: refs/heads/master i:   248191:
 ef8194ce21f36b9e59d9406b3892d2d6bb8c530c v: v3

---
 [refs]                      | 2 +-
 trunk/sound/pci/intel8x0m.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 52d656c8c00f..c2ef6a94bdce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 217658f46c2dbfe260f8f5976f2a201911a2f4c6
+refs/heads/master: df1fe13289eca445b77471c204408bec67313be3
diff --git a/trunk/sound/pci/intel8x0m.c b/trunk/sound/pci/intel8x0m.c
index 2ae8d29500a8..bae3a279f75f 100644
--- a/trunk/sound/pci/intel8x0m.c
+++ b/trunk/sound/pci/intel8x0m.c
@@ -235,8 +235,8 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0m_ids) = {
 	{ PCI_VDEVICE(NVIDIA, 0x0069), DEVICE_NFORCE }, /* NFORCE2 */
 	{ PCI_VDEVICE(NVIDIA, 0x0089), DEVICE_NFORCE }, /* NFORCE2s */
 	{ PCI_VDEVICE(NVIDIA, 0x00d9), DEVICE_NFORCE }, /* NFORCE3 */
+	{ PCI_VDEVICE(AMD, 0x746e), DEVICE_INTEL },	/* AMD8111 */
 #if 0
-	{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL },	/* AMD8111 */
 	{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI },   /* Ali5455 */
 #endif
 	{ 0, }
@@ -1261,9 +1261,9 @@ static struct shortname_table {
 	{ PCI_DEVICE_ID_NVIDIA_MCP2_MODEM, "NVidia nForce2" },
 	{ PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM, "NVidia nForce2s" },
 	{ PCI_DEVICE_ID_NVIDIA_MCP3_MODEM, "NVidia nForce3" },
+	{ 0x746e, "AMD AMD8111" },
 #if 0
 	{ 0x5455, "ALi M5455" },
-	{ 0x746d, "AMD AMD8111" },
 #endif
 	{ 0 },
 };