3.18-stable patches

added patches:
	input-gscps2-fix-module_device_table-invocation.patch

diff --git a/queue-3.18/input-gscps2-fix-module_device_table-invocation.patch b/queue-3.18/input-gscps2-fix-module_device_table-invocation.patch
new file mode 100644 (file)
index 0000000..6b661b4
--- /dev/null
+++ b/queue-3.18/input-gscps2-fix-module_device_table-invocation.patch
@@ -0,0 +1,44 @@
+From 6c8afa88adce613c23f27e719f805cc2a6441b07 Mon Sep 17 00:00:00 2001
+From: Geert Uytterhoeven <geert@linux-m68k.org>
+Date: Wed, 4 Feb 2015 10:59:25 -0800
+Subject: Input: gscps2 - fix MODULE_DEVICE_TABLE invocation
+
+From: Geert Uytterhoeven <geert@linux-m68k.org>
+
+commit 6c8afa88adce613c23f27e719f805cc2a6441b07 upstream.
+
+The patch "module: fix types of device tables aliases" newly requires
+that invocations of
+
+MODULE_DEVICE_TABLE(type, name);
+
+come *after* the definition of `name'.  That is reasonable, but gscps2
+wasn't doing this.  Fix it.
+
+Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/input/serio/gscps2.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/input/serio/gscps2.c
++++ b/drivers/input/serio/gscps2.c
+@@ -40,7 +40,6 @@
+ MODULE_AUTHOR("Laurent Canet <canetl@esiee.fr>, Thibaut Varene <varenet@parisc-linux.org>, Helge Deller <deller@gmx.de>");
+ MODULE_DESCRIPTION("HP GSC PS2 port driver");
+ MODULE_LICENSE("GPL");
+-MODULE_DEVICE_TABLE(parisc, gscps2_device_tbl);
+ 
+ #define PFX "gscps2.c: "
+ 
+@@ -439,6 +438,7 @@ static struct parisc_device_id gscps2_de
+ #endif
+       { 0, }  /* 0 terminated list */
+ };
++MODULE_DEVICE_TABLE(parisc, gscps2_device_tbl);
+ 
+ static struct parisc_driver parisc_ps2_driver = {
+       .name           = "gsc_ps2",

diff --git a/queue-3.18/series b/queue-3.18/series
index 585a6b2a8905a35cc0ed204db75cf487209f9ef1..32d8aa83f3d90ea1a5bd1d1e10a5155fd79243fc 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -143,3 +143,4 @@ net-fix-socket-refcounting-in-skb_complete_tx_timestamp.patch
 uapi-fix-linux-packet_diag.h-userspace-compilation-error.patch
 dccp-tcp-fix-routing-redirect-race.patch
 dccp-fix-memory-leak-during-tear-down-of-unsuccessful-connection-request.patch
+input-gscps2-fix-module_device_table-invocation.patch