From: Greg Kroah-Hartman Date: Tue, 30 Mar 2010 20:07:17 +0000 (-0700) Subject: remove queue-2.6.32/alsa-hda-add-pci-quirks-for-msi-neton-ap1900-and-wind-top-ae2220... X-Git-Tag: v2.6.27.46~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a955d7fe841debc0623a56405d4fbf4f09b1d954;p=thirdparty%2Fkernel%2Fstable-queue.git remove queue-2.6.32/alsa-hda-add-pci-quirks-for-msi-neton-ap1900-and-wind-top-ae2220.patch from both the .32 and .33 queues --- diff --git a/queue-2.6.32/alsa-hda-add-pci-quirks-for-msi-neton-ap1900-and-wind-top-ae2220.patch b/queue-2.6.32/alsa-hda-add-pci-quirks-for-msi-neton-ap1900-and-wind-top-ae2220.patch deleted file mode 100644 index 5d18ac36046..00000000000 --- a/queue-2.6.32/alsa-hda-add-pci-quirks-for-msi-neton-ap1900-and-wind-top-ae2220.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b43f6e5e258d67acae5961896d10bbe38c271070 Mon Sep 17 00:00:00 2001 -From: Anisse Astier -Date: Wed, 10 Mar 2010 19:17:46 +0100 -Subject: ALSA: hda - Add PCI quirks for MSI NetOn AP1900 and Wind Top AE2220 - -From: Anisse Astier - -commit b43f6e5e258d67acae5961896d10bbe38c271070 upstream. - -This should make the speakers and jack detection work on MSI all-in-one -computers NetOn AP1900 and Wind Top AE2220. - -Signed-off-by: Anisse Astier -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/pci/hda/patch_realtek.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -8881,6 +8881,7 @@ static struct snd_pci_quirk alc882_cfg_t - SND_PCI_QUIRK(0x1462, 0x4314, "MSI", ALC883_TARGA_DIG), - SND_PCI_QUIRK(0x1462, 0x4319, "MSI", ALC883_TARGA_DIG), - SND_PCI_QUIRK(0x1462, 0x4324, "MSI", ALC883_TARGA_DIG), -+ SND_PCI_QUIRK(0x1462, 0x4570, "MSI Wind Top AE2220", ALC883_TARGA_DIG), - SND_PCI_QUIRK(0x1462, 0x6510, "MSI GX620", ALC883_TARGA_8ch_DIG), - SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC883_6ST_DIG), - SND_PCI_QUIRK(0x1462, 0x7187, "MSI", ALC883_6ST_DIG), -@@ -8890,6 +8891,7 @@ static struct snd_pci_quirk alc882_cfg_t - SND_PCI_QUIRK(0x1462, 0x7280, "MSI", ALC883_6ST_DIG), - SND_PCI_QUIRK(0x1462, 0x7327, "MSI", ALC883_6ST_DIG), - SND_PCI_QUIRK(0x1462, 0x7350, "MSI", ALC883_6ST_DIG), -+ SND_PCI_QUIRK(0x1462, 0x7437, "MSI NetOn AP1900", ALC883_TARGA_DIG), - SND_PCI_QUIRK(0x1462, 0xa422, "MSI", ALC883_TARGA_2ch_DIG), - SND_PCI_QUIRK(0x1462, 0xaa08, "MSI", ALC883_TARGA_2ch_DIG), - diff --git a/queue-2.6.32/series b/queue-2.6.32/series index 172c712ba4b..a584517e693 100644 --- a/queue-2.6.32/series +++ b/queue-2.6.32/series @@ -42,7 +42,6 @@ sched-fix-sched_mc-regression-caused-by-change-in-sched-cpu_power.patch readahead-add-blk_run_backing_dev.patch alsa-hda-use-lpib-and-6stack-dig-for-emachines-t5212.patch alsa-hda-disable-msi-for-nvidia-controller.patch -alsa-hda-add-pci-quirks-for-msi-neton-ap1900-and-wind-top-ae2220.patch alsa-hda-fix-secondary-adc-of-alc260-basic-model.patch alsa-hda-fix-0-db-offset-for-hp-laptops-using-cx20551-waikiki.patch alsa-cmipci-work-around-invalid-pcm-pointer.patch diff --git a/queue-2.6.33/alsa-hda-add-pci-quirks-for-msi-neton-ap1900-and-wind-top-ae2220.patch b/queue-2.6.33/alsa-hda-add-pci-quirks-for-msi-neton-ap1900-and-wind-top-ae2220.patch deleted file mode 100644 index 287d6a2a036..00000000000 --- a/queue-2.6.33/alsa-hda-add-pci-quirks-for-msi-neton-ap1900-and-wind-top-ae2220.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b43f6e5e258d67acae5961896d10bbe38c271070 Mon Sep 17 00:00:00 2001 -From: Anisse Astier -Date: Wed, 10 Mar 2010 19:17:46 +0100 -Subject: ALSA: hda - Add PCI quirks for MSI NetOn AP1900 and Wind Top AE2220 - -From: Anisse Astier - -commit b43f6e5e258d67acae5961896d10bbe38c271070 upstream. - -This should make the speakers and jack detection work on MSI all-in-one -computers NetOn AP1900 and Wind Top AE2220. - -Signed-off-by: Anisse Astier -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/pci/hda/patch_realtek.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -9061,6 +9061,7 @@ static struct snd_pci_quirk alc882_cfg_t - SND_PCI_QUIRK(0x1462, 0x4314, "MSI", ALC883_TARGA_DIG), - SND_PCI_QUIRK(0x1462, 0x4319, "MSI", ALC883_TARGA_DIG), - SND_PCI_QUIRK(0x1462, 0x4324, "MSI", ALC883_TARGA_DIG), -+ SND_PCI_QUIRK(0x1462, 0x4570, "MSI Wind Top AE2220", ALC883_TARGA_DIG), - SND_PCI_QUIRK(0x1462, 0x6510, "MSI GX620", ALC883_TARGA_8ch_DIG), - SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC883_6ST_DIG), - SND_PCI_QUIRK(0x1462, 0x7187, "MSI", ALC883_6ST_DIG), -@@ -9070,6 +9071,7 @@ static struct snd_pci_quirk alc882_cfg_t - SND_PCI_QUIRK(0x1462, 0x7280, "MSI", ALC883_6ST_DIG), - SND_PCI_QUIRK(0x1462, 0x7327, "MSI", ALC883_6ST_DIG), - SND_PCI_QUIRK(0x1462, 0x7350, "MSI", ALC883_6ST_DIG), -+ SND_PCI_QUIRK(0x1462, 0x7437, "MSI NetOn AP1900", ALC883_TARGA_DIG), - SND_PCI_QUIRK(0x1462, 0xa422, "MSI", ALC883_TARGA_2ch_DIG), - SND_PCI_QUIRK(0x1462, 0xaa08, "MSI", ALC883_TARGA_2ch_DIG), - diff --git a/queue-2.6.33/series b/queue-2.6.33/series index 8f5f93acfd5..427119d8821 100644 --- a/queue-2.6.33/series +++ b/queue-2.6.33/series @@ -38,7 +38,6 @@ perf-annotate-defer-allocating-sym_priv-hist-array.patch sched-fix-sched_mc-regression-caused-by-change-in-sched-cpu_power.patch alsa-hda-use-lpib-and-6stack-dig-for-emachines-t5212.patch alsa-hda-disable-msi-for-nvidia-controller.patch -alsa-hda-add-pci-quirks-for-msi-neton-ap1900-and-wind-top-ae2220.patch alsa-hda-fix-secondary-adc-of-alc260-basic-model.patch alsa-hda-fix-0-db-offset-for-hp-laptops-using-cx20551-waikiki.patch alsa-cmipci-work-around-invalid-pcm-pointer.patch