summaryrefslogtreecommitdiffstats
path: root/disable-i8042-check-on-apple-mac.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-09-16 09:07:16 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-09-16 09:07:16 -0400
commitcf23086f03db3db081d5bfab14d6d92e2d67c289 (patch)
treedc1d979cdd8ac2217dcf760960933094e36de569 /disable-i8042-check-on-apple-mac.patch
parent7094b06a730e849d19d2e0ad57ee49566e790c8d (diff)
downloadkernel-cf23086f03db3db081d5bfab14d6d92e2d67c289.tar.gz
kernel-cf23086f03db3db081d5bfab14d6d92e2d67c289.tar.xz
kernel-cf23086f03db3db081d5bfab14d6d92e2d67c289.zip
Linux v3.17-rc5-13-g2324067fa9a4
- Reenable debugging options.
Diffstat (limited to 'disable-i8042-check-on-apple-mac.patch')
-rw-r--r--disable-i8042-check-on-apple-mac.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/disable-i8042-check-on-apple-mac.patch b/disable-i8042-check-on-apple-mac.patch
index 60a8322f7..b71c3445b 100644
--- a/disable-i8042-check-on-apple-mac.patch
+++ b/disable-i8042-check-on-apple-mac.patch
@@ -1,4 +1,4 @@
-From 543d1b49fac4ad0dbc0fecb39007ea528436fb88 Mon Sep 17 00:00:00 2001
+From 53e0d01e8d7ac658bde8a81f7e8ceaf87974b5d2 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
@@ -18,10 +18,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 612f855c340f..f1aeb0240d6e 100644
+index 9bb95eab6926..4b5015f27f9e 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
-@@ -1469,6 +1469,22 @@ static struct platform_driver i8042_driver = {
+@@ -1471,6 +1471,22 @@ static struct platform_driver i8042_driver = {
.shutdown = i8042_shutdown,
};
@@ -44,7 +44,7 @@ index 612f855c340f..f1aeb0240d6e 100644
static int __init i8042_init(void)
{
struct platform_device *pdev;
-@@ -1476,6 +1492,12 @@ static int __init i8042_init(void)
+@@ -1478,6 +1494,12 @@ static int __init i8042_init(void)
dbg_init();