From 985e773bfa45b3c84a8057f5ccfa139aad28a4c9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 1 Dec 2013 17:57:48 -0800 Subject: [PATCH] 3.4-stable patches added patches: input-i8042-add-pnp-modaliases.patch --- .../input-i8042-add-pnp-modaliases.patch | 40 +++++++++++++++++++ queue-3.4/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 queue-3.4/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 +Date: Thu, 31 Oct 2013 00:33:54 -0700 +Subject: Input: i8042 - add PNP modaliases + +From: Tom Gundersen + +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 +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + 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 -- 2.47.3