diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-02 15:19:13 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-02 15:19:13 -0400 |
| commit | 23c2849918aa9195e38eb680bfc3387d07ab7a12 (patch) | |
| tree | eb6393f000d8f960c9d248565ab607134b78a654 | |
| parent | 6e1a948b75e359a811ce0822e4e90cbd6474dd32 (diff) | |
| download | kernel-23c2849918aa9195e38eb680bfc3387d07ab7a12.tar.gz kernel-23c2849918aa9195e38eb680bfc3387d07ab7a12.tar.xz kernel-23c2849918aa9195e38eb680bfc3387d07ab7a12.zip | |
Drop merged backlight quirk patch
This went upstream as commit 3295d73002f4be341069a000aec4b8d7e5ea8d2c in 4.0-rc1
| -rw-r--r-- | acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch | 37 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 0 insertions, 43 deletions
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 daba28bfa..000000000 --- a/acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Hans de Goede <hdegoede@redhat.com> -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 <hdegoede@redhat.com> ---- - drivers/acpi/video.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c -index 5b9c0bae4503..998c47f6d42b 100644 ---- a/drivers/acpi/video.c -+++ b/drivers/acpi/video.c -@@ -522,6 +522,15 @@ static struct dmi_system_id video_dmi_table[] __initdata = { - DMI_MATCH(DMI_PRODUCT_NAME, "370R4E/370R4V/370R5E/3570RE/370R5V"), - }, - }, -+ { -+ /* 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"), -+ }, -+ }, - - { - /* https://bugzilla.redhat.com/show_bug.cgi?id=1163574 */ --- -2.1.0 - diff --git a/kernel.spec b/kernel.spec index a5aa6b7d0..707120e55 100644 --- a/kernel.spec +++ b/kernel.spec @@ -589,9 +589,6 @@ Patch21242: criu-no-expert.patch #rhbz 892811 Patch21247: ath9k-rx-dma-stop-check.patch -#rhbz 1094948 -Patch26131: acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch - #CVE-2015-2150 rhbz 1196266 1200397 Patch26175: xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch @@ -1319,9 +1316,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-2150 rhbz 1196266 1200397 ApplyPatch xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch |