Merge branch 'topic/hda' into for-linus

diff --combined sound/pci/hda/hda_intel.c
index d5c93ad852ee63f7883ccdba924ea41de0e6cc39,e37bffec749a6850f67ff76a1d496eea81ea24d8..43b7cfb7cffd9edcc2ea91da2b6ea11b001cdf7e
--- 1/sound/pci/hda/hda_intel.c
--- 2/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -267,7 -267,8 +267,8 @@@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SD
  #define RIRB_INT_MASK         0x05
  
  /* STATESTS int mask: S3,SD2,SD1,SD0 */
- #define AZX_MAX_CODECS                4
+ #define AZX_MAX_CODECS                8
+ #define AZX_DEFAULT_CODECS    4
  #define STATESTS_INT_MASK     ((1 << AZX_MAX_CODECS) - 1)
  
  /* SD_CTL bits */
@@@ -1367,6 -1368,7 +1368,7 @@@ static void azx_bus_reset(struct hda_bu
  
  /* number of codec slots for each chipset: 0 = default slots (i.e. 4) */
  static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] __devinitdata = {
+       [AZX_DRIVER_NVIDIA] = 8,
        [AZX_DRIVER_TERA] = 1,
  };
  
@@@ -1399,7 -1401,7 +1401,7 @@@ static int __devinit azx_codec_create(s
        codecs = 0;
        max_slots = azx_max_codecs[chip->driver_type];
        if (!max_slots)
-               max_slots = AZX_MAX_CODECS;
+               max_slots = AZX_DEFAULT_CODECS;
  
        /* First try to probe all given codec slots */
        for (c = 0; c < max_slots; c++) {
@@@ -2263,10 -2265,12 +2265,12 @@@ static int azx_dev_free(struct snd_devi
  static struct snd_pci_quirk position_fix_list[] __devinitdata = {
        SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),
+       SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
        SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),
+       SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),
        {}
  };
  
@@@ -2354,6 -2358,7 +2358,7 @@@ static void __devinit check_probe_mask(
  static struct snd_pci_quirk msi_black_list[] __devinitdata = {
        SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */
        SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */
+       SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */
        {}
  };
  
@@@ -2687,7 -2692,7 +2692,7 @@@ static void __devexit azx_remove(struc
  }
  
  /* PCI IDs */
 -static struct pci_device_id azx_ids[] = {
 +static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
        /* ICH 6..10 */
        { PCI_DEVICE(0x8086, 0x2668), .driver_data = AZX_DRIVER_ICH },
        { PCI_DEVICE(0x8086, 0x27d8), .driver_data = AZX_DRIVER_ICH },