diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-16 07:43:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-16 07:43:04 +0100 |
| commit | 0b4baa69fc5137bc848ebcdfa93c4b891ade1754 (patch) | |
| tree | 4622f51820cdd74135f0e1bac07beaca3abb84d3 | |
| parent | fffa6d1f526e8d52ad5807050a8052a6718381f5 (diff) | |
| download | alsa-driver-build-unstable-0b4baa69fc5137bc848ebcdfa93c4b891ade1754.tar.gz | |
Regenerate hda_intel.patch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | pci/hda/hda_intel.patch | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pci/hda/hda_intel.patch b/pci/hda/hda_intel.patch index 693bade6f..58502c3e4 100644 --- a/pci/hda/hda_intel.patch +++ b/pci/hda/hda_intel.patch @@ -1,11 +1,11 @@ ---- ../../alsa-kernel/pci/hda/hda_intel.c 2009-12-22 08:18:18.547773851 +0100 -+++ hda_intel.c 2009-12-22 08:36:21.275945095 +0100 +--- ../../alsa-kernel/pci/hda/hda_intel.c 2010-03-15 15:54:10.943774798 +0100 ++++ hda_intel.c 2010-03-16 07:42:31.311522259 +0100 @@ -1,3 +1,4 @@ +#include "adriver.h" /* * * hda_intel.c - Implementation of primary alsa driver code base -@@ -2318,6 +2319,10 @@ +@@ -2352,6 +2353,10 @@ } } @@ -16,7 +16,7 @@ /* * white/black-list for enable_msi */ -@@ -2326,6 +2331,14 @@ +@@ -2363,6 +2368,14 @@ {} }; @@ -31,7 +31,7 @@ static void __devinit check_msi(struct azx *chip) { const struct snd_pci_quirk *q; -@@ -2334,14 +2347,29 @@ +@@ -2371,7 +2384,11 @@ chip->msi = !!enable_msi; return; } @@ -43,10 +43,9 @@ q = snd_pci_quirk_lookup(chip->pci, msi_black_list); if (q) { printk(KERN_INFO - "hda_intel: msi for device %04x:%04x set to %d\n", - q->subvendor, q->subdevice, q->value); +@@ -2380,6 +2397,16 @@ chip->msi = q->value; -+ return; + return; } +#ifndef AZX_ENABLE_MSI_DEFAULT + q = snd_pci_quirk_lookup(chip->pci, msi_white_list); @@ -58,10 +57,10 @@ + return; + } +#endif - } - -@@ -2446,7 +2474,7 @@ + /* NVidia chipsets seem to cause troubles with MSI */ + if (chip->driver_type == AZX_DRIVER_NVIDIA) { +@@ -2491,7 +2518,7 @@ PCI_DEVICE_ID_ATI_SBX00_SMBUS, NULL); if (p_smbus) { |