1 files changed, 7 insertions, 63 deletions

diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index d846cbfaa31c..b96f87e73398 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -94,62 +94,6 @@ MODULE_PARM_DESC(xbox, "Set to 1 for Xbox, if you have problems with the AC'97 c
 /*
  *  Direct registers
  */
-
-#ifndef PCI_DEVICE_ID_INTEL_82801
-#define PCI_DEVICE_ID_INTEL_82801       0x2415
-#endif
-#ifndef PCI_DEVICE_ID_INTEL_82901
-#define PCI_DEVICE_ID_INTEL_82901       0x2425
-#endif
-#ifndef PCI_DEVICE_ID_INTEL_82801BA
-#define PCI_DEVICE_ID_INTEL_82801BA     0x2445
-#endif
-#ifndef PCI_DEVICE_ID_INTEL_440MX
-#define PCI_DEVICE_ID_INTEL_440MX       0x7195
-#endif
-#ifndef PCI_DEVICE_ID_INTEL_ICH3
-#define PCI_DEVICE_ID_INTEL_ICH3        0x2485
-#endif
-#ifndef PCI_DEVICE_ID_INTEL_ICH4
-#define PCI_DEVICE_ID_INTEL_ICH4        0x24c5
-#endif
-#ifndef PCI_DEVICE_ID_INTEL_ICH5
-#define PCI_DEVICE_ID_INTEL_ICH5        0x24d5
-#endif
-#ifndef PCI_DEVICE_ID_INTEL_ESB_5
-#define PCI_DEVICE_ID_INTEL_ESB_5       0x25a6
-#endif
-#ifndef PCI_DEVICE_ID_INTEL_ICH6_18
-#define PCI_DEVICE_ID_INTEL_ICH6_18     0x266e
-#endif
-#ifndef PCI_DEVICE_ID_INTEL_ICH7_20
-#define PCI_DEVICE_ID_INTEL_ICH7_20     0x27de
-#endif
-#ifndef PCI_DEVICE_ID_INTEL_ESB2_14
-#define PCI_DEVICE_ID_INTEL_ESB2_14     0x2698
-#endif
-#ifndef PCI_DEVICE_ID_SI_7012
-#define PCI_DEVICE_ID_SI_7012           0x7012
-#endif
-#ifndef PCI_DEVICE_ID_NVIDIA_MCP_AUDIO
-#define PCI_DEVICE_ID_NVIDIA_MCP_AUDIO  0x01b1
-#endif
-#ifndef PCI_DEVICE_ID_NVIDIA_CK804_AUDIO
-#define PCI_DEVICE_ID_NVIDIA_CK804_AUDIO 0x0059
-#endif
-#ifndef PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO
-#define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO 0x006a
-#endif
-#ifndef PCI_DEVICE_ID_NVIDIA_CK8_AUDIO
-#define PCI_DEVICE_ID_NVIDIA_CK8_AUDIO  0x008a
-#endif
-#ifndef PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO
-#define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO 0x00da
-#endif
-#ifndef PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO
-#define PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO 0x00ea
-#endif
-
 enum { DEVICE_INTEL, DEVICE_INTEL_ICH4, DEVICE_SIS, DEVICE_ALI, DEVICE_NFORCE };
 
 #define ICHREG(x) ICH_REG_##x
@@ -2801,19 +2745,19 @@ static struct shortname_table {
         unsigned int id;
         const char *s;
 } shortnames[] __devinitdata = {
-        { PCI_DEVICE_ID_INTEL_82801, "Intel 82801AA-ICH" },
-        { PCI_DEVICE_ID_INTEL_82901, "Intel 82901AB-ICH0" },
-        { PCI_DEVICE_ID_INTEL_82801BA, "Intel 82801BA-ICH2" },
+        { PCI_DEVICE_ID_INTEL_82801AA_5, "Intel 82801AA-ICH" },
+        { PCI_DEVICE_ID_INTEL_82801AB_5, "Intel 82901AB-ICH0" },
+        { PCI_DEVICE_ID_INTEL_82801BA_4, "Intel 82801BA-ICH2" },
         { PCI_DEVICE_ID_INTEL_440MX, "Intel 440MX" },
-        { PCI_DEVICE_ID_INTEL_ICH3, "Intel 82801CA-ICH3" },
-        { PCI_DEVICE_ID_INTEL_ICH4, "Intel 82801DB-ICH4" },
-        { PCI_DEVICE_ID_INTEL_ICH5, "Intel ICH5" },
+        { PCI_DEVICE_ID_INTEL_82801CA_5, "Intel 82801CA-ICH3" },
+        { PCI_DEVICE_ID_INTEL_82801DB_5, "Intel 82801DB-ICH4" },
+        { PCI_DEVICE_ID_INTEL_82801EB_5, "Intel ICH5" },
         { PCI_DEVICE_ID_INTEL_ESB_5, "Intel 6300ESB" },
         { PCI_DEVICE_ID_INTEL_ICH6_18, "Intel ICH6" },
         { PCI_DEVICE_ID_INTEL_ICH7_20, "Intel ICH7" },
         { PCI_DEVICE_ID_INTEL_ESB2_14, "Intel ESB2" },
         { PCI_DEVICE_ID_SI_7012, "SiS SI7012" },
-        { PCI_DEVICE_ID_NVIDIA_MCP_AUDIO, "NVidia nForce" },
+        { PCI_DEVICE_ID_NVIDIA_MCP1_AUDIO, "NVidia nForce" },
         { PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, "NVidia nForce2" },
         { PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO, "NVidia nForce3" },
         { PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO, "NVidia CK8S" },