From 3fb93d9892bdeaebc8200a1e51e765323e741fbd Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 2 Jun 2015 15:19:13 -0400 Subject: [PATCH] Drop merged backlight quirk patch This went upstream as commit 3295d73002f4be341069a000aec4b8d7e5ea8d2c in 4.0-rc1 --- ...isable_native_backlight-quirk-for-Sa.patch | 38 ------------------- kernel.spec | 6 --- 2 files changed, 44 deletions(-) delete mode 100644 acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch diff --git a/acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch b/acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch deleted file mode 100644 index 436930d42..000000000 --- a/acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Hans de Goede -Date: Fri, 9 Jan 2015 15:28:29 +0100 -Subject: [PATCH] acpi-video: Add disable_native_backlight quirk for Samsung - 730U3E/740U3E - -The Samsung 730U3E/740U3E has integrated ATI Radeon graphics, and backlight -control does not work properly when using the native interfaces. - -BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1094948 -Signed-off-by: Hans de Goede ---- - drivers/acpi/video.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c -index 25863442b6ae..5c4e35bebd3b 100644 ---- a/drivers/acpi/video.c -+++ b/drivers/acpi/video.c -@@ -505,7 +505,15 @@ static struct dmi_system_id video_dmi_table[] __initdata = { - DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY 15 Notebook PC"), - }, - }, -- -+ { -+ /* https://bugzilla.redhat.com/show_bug.cgi?id=1094948 */ -+ .callback = video_disable_native_backlight, -+ .ident = "SAMSUNG 730U3E/740U3E", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "730U3E/740U3E"), -+ }, -+ }, - { - .callback = video_disable_native_backlight, - .ident = "SAMSUNG 870Z5E/880Z5E/680Z5E", --- -2.1.0 - diff --git a/kernel.spec b/kernel.spec index 5585fb81f..e8c974a22 100644 --- a/kernel.spec +++ b/kernel.spec @@ -609,9 +609,6 @@ Patch21247: ath9k-rx-dma-stop-check.patch Patch22000: weird-root-dentry-name-debug.patch -#rhbz 1094948 -Patch26131: acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch - #CVE-2015-0275 rhbz 1193907 1195178 Patch26138: ext4-Allocate-entire-range-in-zero-range.patch @@ -1400,9 +1397,6 @@ ApplyPatch criu-no-expert.patch #rhbz 892811 ApplyPatch ath9k-rx-dma-stop-check.patch -#rhbz 1094948 -ApplyPatch acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch - #CVE-2015-0275 rhbz 1193907 1195178 ApplyPatch ext4-Allocate-entire-range-in-zero-range.patch