Changeset 499 for GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/intel8x0.c

Timestamp:

Jul 5, 2010, 11:51:20 AM (15 years ago)

Author:

Paul Smedley

Message:

Update Uniaud32-2.1.x branch with necessary changes for ALSA 1.0.23

File:

• GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/intel8x0.c (modified) (8 diffs)

GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/intel8x0.c

@@ -421 +421 @@
 };
 
-static struct pci_device_id snd_intel8x0_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0_ids) = {
         { PCI_VDEVICE(INTEL, 0x2415), DEVICE_INTEL },   /* 82801AA */
         { PCI_VDEVICE(INTEL, 0x2425), DEVICE_INTEL },   /* 82901AB */
@@ -1839 +1839 @@
         {
                 .subvendor = 0x1028,
+                .subdevice = 0x0151,
+                .name = "Dell Optiplex GX270",  /* AD1981B */
+                .type = AC97_TUNE_HP_ONLY
+        },
+        {
+                .subvendor = 0x1028,
                 .subdevice = 0x014e,
                 .name = "Dell D800", /* STAC9750/51 */
-                .type = AC97_TUNE_HP_ONLY
-        },
-        {
-                .subvendor = 0x1028,
-                .subdevice = 0x0151,
-                .name = "Dell Optiplex GX270",  /* AD1981B */
                 .type = AC97_TUNE_HP_ONLY
         },
@@ -1905 +1905 @@
         {
                 .subvendor = 0x103c,
-                .subdevice = 0x0934,
-                .name = "HP nc8220",
-                .type = AC97_TUNE_HP_MUTE_LED
+                .subdevice = 0x129d,
+                .name = "HP xw8000",
+                .type = AC97_TUNE_HP_ONLY
         },
         {
@@ -1917 +1917 @@
         {
                 .subvendor = 0x103c,
+                .subdevice = 0x099c,
+                .name = "HP nx6110/nc6120",
+                .type = AC97_TUNE_HP_MUTE_LED
+        },
+        {
+                .subvendor = 0x103c,
                 .subdevice = 0x0944,
                 .name = "HP nc6220",
@@ -1923 +1929 @@
         {
                 .subvendor = 0x103c,
-                .subdevice = 0x099c,
-                .name = "HP nx6110/nc6120",
+                .subdevice = 0x0934,
+                .name = "HP nc8220",
                 .type = AC97_TUNE_HP_MUTE_LED
-        },
-        {
-                .subvendor = 0x103c,
-                .subdevice = 0x129d,
-                .name = "HP xw8000",
-                .type = AC97_TUNE_HP_ONLY
         },
         {
@@ -1953 +1953 @@
         {
                 .subvendor = 0x104d,
+                .subdevice = 0x8144,
+                .name = "Sony",
+                .type = AC97_TUNE_INV_EAPD
+        },
+        {
+                .subvendor = 0x104d,
                 .subdevice = 0x8197,
                 .name = "Sony S1XP",
+                .type = AC97_TUNE_INV_EAPD
+        },
+        {
+                .subvendor = 0x104d,
+                .subdevice = 0x81c0,
+                .name = "Sony VAIO VGN-T350P", /*AD1981B*/
+                .type = AC97_TUNE_INV_EAPD
+        },
+        {
+                .subvendor = 0x104d,
+                .subdevice = 0x81c5,
+                .name = "Sony VAIO VGN-B1VP", /*AD1981B*/
                 .type = AC97_TUNE_INV_EAPD
         },
@@ -2048 +2066 @@
         },
         {
+                .subvendor = 0x161f,
+                .subdevice = 0x203a,
+                .name = "Gateway 4525GZ",               /* AD1981B */
+                .type = AC97_TUNE_INV_EAPD
+        },
+        {
                 .subvendor = 0x1734,
                 .subdevice = 0x0088,
@@ -2057 +2081 @@
                 .subdevice = 0x0111,
                 .name = "Gateway 2000 ICH2/AD1885",
-                .type = AC97_TUNE_HP_ONLY
-        },
-        {
-                .subvendor = 0x8086,
-                .subdevice = 0x0104,
-                .name = "Intel D845GEBV2",              /* AD1981B */
                 .type = AC97_TUNE_HP_ONLY
         },