summaryrefslogtreecommitdiffstats
path: root/disable-i8042-check-on-apple-mac.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 /disable-i8042-check-on-apple-mac.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 'disable-i8042-check-on-apple-mac.patch')
-rw-r--r--disable-i8042-check-on-apple-mac.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/disable-i8042-check-on-apple-mac.patch b/disable-i8042-check-on-apple-mac.patch
index 0ada396a4..793bada3d 100644
--- a/disable-i8042-check-on-apple-mac.patch
+++ b/disable-i8042-check-on-apple-mac.patch
@@ -17,10 +17,10 @@ Signed-off-by: Bastien Nocera <hadess@hadess.net>
1 file changed, 22 insertions(+)
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
-index f91ed715b604..d64498a0d473 100644
+index bfb0b2280df0..06b10fe7e65b 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
-@@ -1470,6 +1470,22 @@ static struct platform_driver i8042_driver = {
+@@ -1484,6 +1484,22 @@ static struct platform_driver i8042_driver = {
.shutdown = i8042_shutdown,
};
@@ -43,7 +43,7 @@ index f91ed715b604..d64498a0d473 100644
static int __init i8042_init(void)
{
struct platform_device *pdev;
-@@ -1477,6 +1493,12 @@ static int __init i8042_init(void)
+@@ -1491,6 +1507,12 @@ static int __init i8042_init(void)
dbg_init();