summaryrefslogtreecommitdiffstats
path: root/input-silence-i8042-noise.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-04-15 10:47:18 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-04-15 10:47:18 -0400
commitcc7213fcfe3019d0f935cd14e9b64c0d77bd25f4 (patch)
treedf0a7fd10cc86eaf4e3eca0ceab421e9e21fb2a0 /input-silence-i8042-noise.patch
parentb18e6e75364d806d76d99333646943f6765095fb (diff)
downloadkernel-cc7213fcfe3019d0f935cd14e9b64c0d77bd25f4.tar.gz
kernel-cc7213fcfe3019d0f935cd14e9b64c0d77bd25f4.tar.xz
kernel-cc7213fcfe3019d0f935cd14e9b64c0d77bd25f4.zip
Linux v4.0-3843-gbb0fd7ab0986
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 840fc38de..3b46d5fc9 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 9717d5f20139..a3101d2fd936 100644
+index 3d874eca7104..deab7897b01f 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 9717d5f20139..a3101d2fd936 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 986a71c614b0..bfb0b2280df0 100644
+index cb5ece77fd7d..4022b75eaad7 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -871,7 +871,6 @@ static int __init i8042_check_aux(void)