summaryrefslogtreecommitdiffstats
path: root/input-silence-i8042-noise.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-11-03 10:15:39 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-11-03 10:15:39 -0500
commita011ddd4b5885228de2005537824815a467d26ca (patch)
tree0d95cc3d51b761c9b4fa304101a86c9516ce0eae /input-silence-i8042-noise.patch
parent3b752c8c75943ec9feb71be1a64b6522989bcf75 (diff)
downloadkernel-a011ddd4b5885228de2005537824815a467d26ca.tar.gz
kernel-a011ddd4b5885228de2005537824815a467d26ca.tar.xz
kernel-a011ddd4b5885228de2005537824815a467d26ca.zip
Linux v3.18-rc3
- Disable debugging options.
Diffstat (limited to 'input-silence-i8042-noise.patch')
-rw-r--r--input-silence-i8042-noise.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/input-silence-i8042-noise.patch b/input-silence-i8042-noise.patch
index 094c1262c..f971723ad 100644
--- a/input-silence-i8042-noise.patch
+++ b/input-silence-i8042-noise.patch
@@ -16,7 +16,7 @@ Upstream-status: Fedora mustard
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
-index 44973196d3fd..0179281a2517 100644
+index 9717d5f20139..a3101d2fd936 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -122,8 +122,6 @@ void device_pm_unlock(void)
@@ -29,7 +29,7 @@ index 44973196d3fd..0179281a2517 100644
if (dev->parent && dev->parent->power.is_prepared)
dev_warn(dev, "parent %s should not be sleeping\n",
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
-index 9a97c2b10926..1160aa081d21 100644
+index f5a98af3b325..9bb95eab6926 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -857,7 +857,6 @@ static int __init i8042_check_aux(void)