From 3698a66ae13e86e93bbe0a4fd73c7f5931189a03 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 17 Mar 2015 09:02:54 -0400 Subject: [PATCH] Drop upstreamed quirk patches that still apply Yay patch(1) for letting these get doubly applied. --- ...b-wmi-Add-wapf4-quirk-for-the-X550VB.patch | 35 ------------------- kernel.spec | 8 ++--- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch diff --git a/asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch b/asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch deleted file mode 100644 index 1ec42f728..000000000 --- a/asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Stanislaw Gruszka -Date: Wed, 22 Oct 2014 14:32:52 +0200 -Subject: [PATCH] asus-nb-wmi: Add wapf4 quirk for the X550VB - -As reported here: http://bugzilla.redhat.com/show_bug.cgi?id=1089731#c23 -the X550VB needs wapf=4 too. - -Signed-off-by: Stanislaw Gruszka ---- - drivers/platform/x86/asus-nb-wmi.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index 3a4951f46065..c1a6cd66af42 100644 ---- a/drivers/platform/x86/asus-nb-wmi.c -+++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -182,6 +182,15 @@ static const struct dmi_system_id asus_quirks[] = { - }, - { - .callback = dmi_matched, -+ .ident = "ASUSTeK COMPUTER INC. X550VB", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "X550VB"), -+ }, -+ .driver_data = &quirk_asus_wapf4, -+ }, -+ { -+ .callback = dmi_matched, - .ident = "ASUSTeK COMPUTER INC. X55A", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), --- -1.9.3 - diff --git a/kernel.spec b/kernel.spec index 6ba9c862d..5ff916c90 100644 --- a/kernel.spec +++ b/kernel.spec @@ -720,9 +720,6 @@ Patch22000: weird-root-dentry-name-debug.patch # Patch series from Hans for various backlight and platform driver fixes Patch26002: samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch -#rhbz 1089731 -Patch26058: asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch - #rhbz 1135338 Patch26090: HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch @@ -738,6 +735,7 @@ Patch26127: uas-Add-US_FL_NO_ATA_1X-for-2-more-Seagate-disk-encl.patch #rhbz 1163574 Patch26130: acpi-video-Add-disable_native_backlight-quirk-for-De.patch + #rhbz 1094948 Patch26131: acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch @@ -1479,9 +1477,6 @@ ApplyPatch ath9k-rx-dma-stop-check.patch # Patch series from Hans for various backlight and platform driver fixes ApplyPatch samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch -#rhbz 1089731 -ApplyPatch asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch - #rhbz 1135338 ApplyPatch HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch @@ -1497,6 +1492,7 @@ ApplyPatch uas-Add-US_FL_NO_ATA_1X-for-2-more-Seagate-disk-encl.patch #rhbz 1163574 ApplyPatch acpi-video-Add-disable_native_backlight-quirk-for-De.patch + #rhbz 1094948 ApplyPatch acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch