summaryrefslogtreecommitdiffstats
path: root/input-silence-i8042-noise.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-01-05 16:09:49 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-01-05 16:09:49 -0500
commit208228cebd8a9b5af5da4e12e3d90e4a03679cf0 (patch)
tree0cf4e87e7877bff42d1f3b480c2d585347ee3eba /input-silence-i8042-noise.patch
parentbfe354a1c3609cdd83fd0647153365ff4f81701f (diff)
downloadkernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.tar.gz
kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.tar.xz
kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.zip
Linux v3.19-rc2
- Temporarily disable aarch64patches - Happy New Year
Diffstat (limited to 'input-silence-i8042-noise.patch')
-rw-r--r--input-silence-i8042-noise.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/input-silence-i8042-noise.patch b/input-silence-i8042-noise.patch
index dcfee1e6d..fa40d1b88 100644
--- a/input-silence-i8042-noise.patch
+++ b/input-silence-i8042-noise.patch
@@ -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 f5a98af3b325..9bb95eab6926 100644
+index 924e4bf357fb..f91ed715b604 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -857,7 +857,6 @@ static int __init i8042_check_aux(void)
@@ -41,10 +41,10 @@ index f5a98af3b325..9bb95eab6926 100644
}
diff --git a/net/can/af_can.c b/net/can/af_can.c
-index ce82337521f6..a3fee4becc93 100644
+index 66e08040ced7..5268a601f406 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
-@@ -158,13 +158,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
+@@ -155,13 +155,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
err = request_module("can-proto-%d", protocol);
/*