From 208228cebd8a9b5af5da4e12e3d90e4a03679cf0 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 5 Jan 2015 16:09:49 -0500 Subject: Linux v3.19-rc2 - Temporarily disable aarch64patches - Happy New Year --- disable-i8042-check-on-apple-mac.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'disable-i8042-check-on-apple-mac.patch') diff --git a/disable-i8042-check-on-apple-mac.patch b/disable-i8042-check-on-apple-mac.patch index 8516532a8..0ada396a4 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 1 file changed, 22 insertions(+) diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c -index 9bb95eab6926..4b5015f27f9e 100644 +index f91ed715b604..d64498a0d473 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c -@@ -1471,6 +1471,22 @@ static struct platform_driver i8042_driver = { +@@ -1470,6 +1470,22 @@ static struct platform_driver i8042_driver = { .shutdown = i8042_shutdown, }; @@ -43,7 +43,7 @@ index 9bb95eab6926..4b5015f27f9e 100644 static int __init i8042_init(void) { struct platform_device *pdev; -@@ -1478,6 +1494,12 @@ static int __init i8042_init(void) +@@ -1477,6 +1493,12 @@ static int __init i8042_init(void) dbg_init(); -- cgit