From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 2 Dec 2013 01:57:48 +0000 (-0800)
Subject: 3.4-stable patches
X-Git-Tag: v3.4.72~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=985e773bfa45b3c84a8057f5ccfa139aad28a4c9;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	input-i8042-add-pnp-modaliases.patch
---

diff --git a/queue-3.4/input-i8042-add-pnp-modaliases.patch b/queue-3.4/input-i8042-add-pnp-modaliases.patch
new file mode 100644
index 00000000000..087bb9861be
--- /dev/null
+++ b/queue-3.4/input-i8042-add-pnp-modaliases.patch
@@ -0,0 +1,40 @@
+From 78551277e4df57864b0b0e7f85c23ede2be2edb8 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Thu, 31 Oct 2013 00:33:54 -0700
+Subject: Input: i8042 - add PNP modaliases
+
+From: Tom Gundersen <teg@jklm.no>
+
+commit 78551277e4df57864b0b0e7f85c23ede2be2edb8 upstream.
+
+This allows the module to be autoloaded in the common case.
+
+In order to work on non-PnP systems the module should be compiled in or
+loaded unconditionally at boot (c.f. modules-load.d(5)), as before.
+
+Signed-off-by: Tom Gundersen <teg@jklm.no>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/input/serio/i8042-x86ia64io.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/input/serio/i8042-x86ia64io.h
++++ b/drivers/input/serio/i8042-x86ia64io.h
+@@ -765,6 +765,7 @@ static struct pnp_device_id pnp_kbd_devi
+ 	{ .id = "CPQA0D7", .driver_data = 0 },
+ 	{ .id = "", },
+ };
++MODULE_DEVICE_TABLE(pnp, pnp_kbd_devids);
+ 
+ static struct pnp_driver i8042_pnp_kbd_driver = {
+ 	.name           = "i8042 kbd",
+@@ -786,6 +787,7 @@ static struct pnp_device_id pnp_aux_devi
+ 	{ .id = "SYN0801", .driver_data = 0 },
+ 	{ .id = "", },
+ };
++MODULE_DEVICE_TABLE(pnp, pnp_aux_devids);
+ 
+ static struct pnp_driver i8042_pnp_aux_driver = {
+ 	.name           = "i8042 aux",
diff --git a/queue-3.4/series b/queue-3.4/series
index 555d1a6d1ac..70eea3f9e3f 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -51,3 +51,4 @@ powerpc-signals-improved-mark-vsx-not-saved-with-small-contexts-fix.patch
 cpuset-fix-memory-allocator-deadlock.patch
 alsa-hda-realtek-set-pcbeep-amp-for-alc668.patch
 tracing-allow-events-to-have-null-strings.patch
+input-i8042-add-pnp-modaliases.patch