summaryrefslogtreecommitdiffstats
path: root/input-silence-i8042-noise.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-01-21 09:50:33 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-01-21 09:50:33 -0500
commit08cb3a2b46ecca75fd23bc1ba9f7558cc8996c35 (patch)
treeb10f9d715116e22c9f58ede7c3c339f6d6a2d563 /input-silence-i8042-noise.patch
parent022b42815f1b6398ef00737424564ecf44fe1959 (diff)
downloadkernel-08cb3a2b46ecca75fd23bc1ba9f7558cc8996c35.tar.gz
kernel-08cb3a2b46ecca75fd23bc1ba9f7558cc8996c35.tar.xz
kernel-08cb3a2b46ecca75fd23bc1ba9f7558cc8996c35.zip
Linux v3.19-rc5-117-g5eb11d6b3f55
- Reenable 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 fa40d1b88..7da6bc888 100644
--- a/input-silence-i8042-noise.patch
+++ b/input-silence-i8042-noise.patch
@@ -29,10 +29,10 @@ 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 924e4bf357fb..f91ed715b604 100644
+index 986a71c614b0..bfb0b2280df0 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
-@@ -857,7 +857,6 @@ static int __init i8042_check_aux(void)
+@@ -871,7 +871,6 @@ static int __init i8042_check_aux(void)
static int i8042_controller_check(void)
{
if (i8042_flush()) {