summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-06-09 10:13:42 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-06-09 10:19:49 -0400
commit8b2b9e776d085bf158d9cf3ba3d1f906c175dbbd (patch)
tree605705b34d1c84e67ad981016fe234cba390d8dd
parent885cb3a4ac96953f4d3e850ea31995978908f404 (diff)
downloadkernel-8b2b9e776d085bf158d9cf3ba3d1f906c175dbbd.tar.gz
kernel-8b2b9e776d085bf158d9cf3ba3d1f906c175dbbd.tar.xz
kernel-8b2b9e776d085bf158d9cf3ba3d1f906c175dbbd.zip
Drop upstreamed patch ideapad patch
This went upstream as edde316acb5f07c04abf09a92f59db5d2efd14e2
-rw-r--r--ideapad-laptop-Add-Lenovo-ideapad-Y700-17ISK-to-no_h.patch40
-rw-r--r--kernel.spec6
2 files changed, 0 insertions, 46 deletions
diff --git a/ideapad-laptop-Add-Lenovo-ideapad-Y700-17ISK-to-no_h.patch b/ideapad-laptop-Add-Lenovo-ideapad-Y700-17ISK-to-no_h.patch
deleted file mode 100644
index 16788f756..000000000
--- a/ideapad-laptop-Add-Lenovo-ideapad-Y700-17ISK-to-no_h.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 14b627c610f93c2700f9a3825ac10c35d51acfe4 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Mon, 7 Dec 2015 13:50:38 -0500
-Subject: [PATCH] ideapad-laptop: Add Lenovo ideapad Y700-17ISK to no_hw_rfkill
- dmi list
-
-One of the newest ideapad models also lacks a physical hw rfkill switch,
-and trying to read the hw rfkill switch through the ideapad module
-causes it to always reported blocking breaking wifi.
-
-Fix it by adding this model to the DMI list.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1286293
-Cc: stable@vger.kernel.org
-Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
----
- drivers/platform/x86/ideapad-laptop.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
-index a313dfc0245f..d28db0e793df 100644
---- a/drivers/platform/x86/ideapad-laptop.c
-+++ b/drivers/platform/x86/ideapad-laptop.c
-@@ -865,6 +865,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
- },
- },
- {
-+ .ident = "Lenovo ideapad Y700-17ISK",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad Y700-17ISK"),
-+ },
-+ },
-+ {
- .ident = "Lenovo Yoga 2 11 / 13 / Pro",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
---
-2.5.0
-
diff --git a/kernel.spec b/kernel.spec
index e12a11a3e..1bac0800e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -591,9 +591,6 @@ Patch508: kexec-uefi-copy-secure_boot-flag-in-boot-params.patch
#rhbz 1287819
Patch570: HID-multitouch-enable-palm-rejection-if-device-imple.patch
-#rhbz 1286293
-Patch571: ideapad-laptop-Add-Lenovo-ideapad-Y700-17ISK-to-no_h.patch
-
#rhbz 1288687
Patch572: alua_fix.patch
@@ -1305,9 +1302,6 @@ ApplyPatch kexec-uefi-copy-secure_boot-flag-in-boot-params.patch
#rhbz 1287819
ApplyPatch HID-multitouch-enable-palm-rejection-if-device-imple.patch
-#rhbz 1286293
-ApplyPatch ideapad-laptop-Add-Lenovo-ideapad-Y700-17ISK-to-no_h.patch
-
#rhbz 1288687
ApplyPatch alua_fix.patch