summaryrefslogtreecommitdiffstats
path: root/disable-i8042-check-on-apple-mac.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-09-08 08:34:33 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-09-08 08:34:33 -0400
commit31448c54f6beec3379570633eef2436db361b26f (patch)
tree70db236286c758ba8e346e3b770b8fe1d60adfe8 /disable-i8042-check-on-apple-mac.patch
parentf88858c592075f9b1ac9149d8c150025e944ebcc (diff)
downloadkernel-31448c54f6beec3379570633eef2436db361b26f.tar.gz
kernel-31448c54f6beec3379570633eef2436db361b26f.tar.xz
kernel-31448c54f6beec3379570633eef2436db361b26f.zip
Linux v4.2-9700-g7d9071a09502
Diffstat (limited to 'disable-i8042-check-on-apple-mac.patch')
-rw-r--r--disable-i8042-check-on-apple-mac.patch12
1 files changed, 8 insertions, 4 deletions
diff --git a/disable-i8042-check-on-apple-mac.patch b/disable-i8042-check-on-apple-mac.patch
index 970d833d4..e75028da2 100644
--- a/disable-i8042-check-on-apple-mac.patch
+++ b/disable-i8042-check-on-apple-mac.patch
@@ -1,3 +1,4 @@
+From 31e64826785b5bafef7a6361516c060be2bca253 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 20 May 2010 10:30:31 -0400
Subject: [PATCH] disable i8042 check on apple mac
@@ -17,11 +18,11 @@ 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 4022b75eaad7..1aaf06aa7b0f 100644
+index c9c98f0ab284..5137185e14a9 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
-@@ -1506,6 +1506,22 @@ static struct platform_driver i8042_driver = {
- .shutdown = i8042_shutdown,
+@@ -1540,6 +1540,22 @@ static struct notifier_block i8042_kbd_bind_notifier_block = {
+ .notifier_call = i8042_kbd_bind_notifier,
};
+#ifdef CONFIG_DMI
@@ -43,7 +44,7 @@ index 4022b75eaad7..1aaf06aa7b0f 100644
static int __init i8042_init(void)
{
struct platform_device *pdev;
-@@ -1513,6 +1529,12 @@ static int __init i8042_init(void)
+@@ -1547,6 +1563,12 @@ static int __init i8042_init(void)
dbg_init();
@@ -56,3 +57,6 @@ index 4022b75eaad7..1aaf06aa7b0f 100644
err = i8042_platform_init();
if (err)
return err;
+--
+2.4.3
+