diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-11-11 11:24:30 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-11-11 11:25:55 -0500 |
commit | f70c487fdb567cdd650d03d0f3eaa82d2480a267 (patch) | |
tree | 26fc932ce298ffd79d9579288689e2b1ab9bb730 /disable-i8042-check-on-apple-mac.patch | |
parent | e208283f33477c6ad3719ea0c13a400828a25fbe (diff) | |
download | kernel-f70c487fdb567cdd650d03d0f3eaa82d2480a267.tar.gz kernel-f70c487fdb567cdd650d03d0f3eaa82d2480a267.tar.xz kernel-f70c487fdb567cdd650d03d0f3eaa82d2480a267.zip |
Linux v4.3
Diffstat (limited to 'disable-i8042-check-on-apple-mac.patch')
-rw-r--r-- | disable-i8042-check-on-apple-mac.patch | 12 |
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 40cdb7df3..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 bfb0b2280df0..06b10fe7e65b 100644 +index c9c98f0ab284..5137185e14a9 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c -@@ -1484,6 +1484,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 bfb0b2280df0..06b10fe7e65b 100644 static int __init i8042_init(void) { struct platform_device *pdev; -@@ -1491,6 +1507,12 @@ static int __init i8042_init(void) +@@ -1547,6 +1563,12 @@ static int __init i8042_init(void) dbg_init(); @@ -56,3 +57,6 @@ index bfb0b2280df0..06b10fe7e65b 100644 err = i8042_platform_init(); if (err) return err; +-- +2.4.3 + |