drop alsa-hda-realtek-add-quirk-entry-for-hp-pavilion-15.patch from 4.9, 4.4, and...

diff --git a/queue-3.18/alsa-hda-realtek-add-quirk-entry-for-hp-pavilion-15.patch b/queue-3.18/alsa-hda-realtek-add-quirk-entry-for-hp-pavilion-15.patch
deleted file mode 100644 (file)
index c748880..0000000
--- a/queue-3.18/alsa-hda-realtek-add-quirk-entry-for-hp-pavilion-15.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 563785edfcef02b566e64fb5292c74c1600808aa Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Mon, 12 Nov 2018 09:43:12 +0100
-Subject: ALSA: hda/realtek - Add quirk entry for HP Pavilion 15
-
-From: Takashi Iwai <tiwai@suse.de>
-
-commit 563785edfcef02b566e64fb5292c74c1600808aa upstream.
-
-HP Pavilion 15 (103c:820d) with ALC295 codec requires the quirk for
-the mute LED control over mic3 pin.  Added the corresponding quirk
-entry.
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=201653
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/pci/hda/patch_realtek.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -5420,6 +5420,7 @@ static const struct snd_pci_quirk alc269
-       SND_PCI_QUIRK(0x103c, 0x2336, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
-       SND_PCI_QUIRK(0x103c, 0x2337, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
-       SND_PCI_QUIRK(0x103c, 0x221c, "HP EliteBook 755 G2", ALC280_FIXUP_HP_HEADSET_MIC),
-+      SND_PCI_QUIRK(0x103c, 0x820d, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
-       SND_PCI_QUIRK(0x103c, 0x8256, "HP", ALC221_FIXUP_HP_FRONT_MIC),
-       SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
-       SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

diff --git a/queue-3.18/series b/queue-3.18/series
index 43b5ea8f373c63af5d2d349721aee9a26db3e7ed..572c43455da5a896e9305d582e84f7cf6e437e77 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -14,7 +14,6 @@ sunrpc-drop-pointless-static-qualifier-in-xdr_get_ne.patch
 revert-bluetooth-h5-fix-missing-dependency-on.patch
 media-v4l-event-add-subscription-to-list-before-calling-add-operation.patch
 uio-fix-an-oops-on-load.patch
-alsa-hda-realtek-add-quirk-entry-for-hp-pavilion-15.patch
 usb-cdc-acm-add-entry-for-hiro-conexant-modem.patch
 usb-quirks-add-no-lpm-quirk-for-raydium-touchscreens.patch
 usb-quirks-add-delay-init-quirk-for-corsair-k70-lux-rgb.patch

diff --git a/queue-4.4/alsa-hda-realtek-add-quirk-entry-for-hp-pavilion-15.patch b/queue-4.4/alsa-hda-realtek-add-quirk-entry-for-hp-pavilion-15.patch
deleted file mode 100644 (file)
index dedd42f..0000000
--- a/queue-4.4/alsa-hda-realtek-add-quirk-entry-for-hp-pavilion-15.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 563785edfcef02b566e64fb5292c74c1600808aa Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Mon, 12 Nov 2018 09:43:12 +0100
-Subject: ALSA: hda/realtek - Add quirk entry for HP Pavilion 15
-
-From: Takashi Iwai <tiwai@suse.de>
-
-commit 563785edfcef02b566e64fb5292c74c1600808aa upstream.
-
-HP Pavilion 15 (103c:820d) with ALC295 codec requires the quirk for
-the mute LED control over mic3 pin.  Added the corresponding quirk
-entry.
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=201653
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/pci/hda/patch_realtek.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -5708,6 +5708,7 @@ static const struct snd_pci_quirk alc269
-       SND_PCI_QUIRK(0x103c, 0x2336, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
-       SND_PCI_QUIRK(0x103c, 0x2337, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
-       SND_PCI_QUIRK(0x103c, 0x221c, "HP EliteBook 755 G2", ALC280_FIXUP_HP_HEADSET_MIC),
-+      SND_PCI_QUIRK(0x103c, 0x820d, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
-       SND_PCI_QUIRK(0x103c, 0x8256, "HP", ALC221_FIXUP_HP_FRONT_MIC),
-       SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
-       SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

diff --git a/queue-4.4/series b/queue-4.4/series
index 4e5a7d9075a5565eb6c79acebcaec45aff004068..8a377ed302b7cc684c6c57bc704e21fa2c2bd108 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -59,7 +59,6 @@ revert-media-videobuf2-core-don-t-call-memop-finish-.patch
 revert-bluetooth-h5-fix-missing-dependency-on.patch
 media-v4l-event-add-subscription-to-list-before-calling-add-operation.patch
 uio-fix-an-oops-on-load.patch
-alsa-hda-realtek-add-quirk-entry-for-hp-pavilion-15.patch
 usb-cdc-acm-add-entry-for-hiro-conexant-modem.patch
 usb-quirks-add-no-lpm-quirk-for-raydium-touchscreens.patch
 usb-quirks-add-delay-init-quirk-for-corsair-k70-lux-rgb.patch

diff --git a/queue-4.9/alsa-hda-realtek-add-quirk-entry-for-hp-pavilion-15.patch b/queue-4.9/alsa-hda-realtek-add-quirk-entry-for-hp-pavilion-15.patch
deleted file mode 100644 (file)
index e00ea43..0000000
--- a/queue-4.9/alsa-hda-realtek-add-quirk-entry-for-hp-pavilion-15.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 563785edfcef02b566e64fb5292c74c1600808aa Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Mon, 12 Nov 2018 09:43:12 +0100
-Subject: ALSA: hda/realtek - Add quirk entry for HP Pavilion 15
-
-From: Takashi Iwai <tiwai@suse.de>
-
-commit 563785edfcef02b566e64fb5292c74c1600808aa upstream.
-
-HP Pavilion 15 (103c:820d) with ALC295 codec requires the quirk for
-the mute LED control over mic3 pin.  Added the corresponding quirk
-entry.
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=201653
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/pci/hda/patch_realtek.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -5764,6 +5764,7 @@ static const struct snd_pci_quirk alc269
-       SND_PCI_QUIRK(0x103c, 0x2336, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
-       SND_PCI_QUIRK(0x103c, 0x2337, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
-       SND_PCI_QUIRK(0x103c, 0x221c, "HP EliteBook 755 G2", ALC280_FIXUP_HP_HEADSET_MIC),
-+      SND_PCI_QUIRK(0x103c, 0x820d, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
-       SND_PCI_QUIRK(0x103c, 0x8256, "HP", ALC221_FIXUP_HP_FRONT_MIC),
-       SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
-       SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

diff --git a/queue-4.9/series b/queue-4.9/series
index 43f956d260d33cb3681e82466bf21f98b567d4be..926a8a54273cb25986137ad876aba13061de1464 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -34,7 +34,6 @@ revert-media-videobuf2-core-don-t-call-memop-finish-.patch
 revert-bluetooth-h5-fix-missing-dependency-on.patch
 media-v4l-event-add-subscription-to-list-before-calling-add-operation.patch
 uio-fix-an-oops-on-load.patch
-alsa-hda-realtek-add-quirk-entry-for-hp-pavilion-15.patch
 usb-cdc-acm-add-entry-for-hiro-conexant-modem.patch
 usb-quirks-add-no-lpm-quirk-for-raydium-touchscreens.patch
 usb-quirks-add-delay-init-quirk-for-corsair-k70-lux-rgb.patch