[kernel] r15938 - in dists/trunk/linux-2.6/debian/patches: debian series

[Ben Hutchings]

Author: benh
Date: Mon Jul  5 11:39:27 2010
New Revision: 15938

Log:
keyboard: Export k_handler again

This is needed by speakup.

Added:
   dists/trunk/linux-2.6/debian/patches/debian/keyboard-export-k_handler.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/base

Added: dists/trunk/linux-2.6/debian/patches/debian/keyboard-export-k_handler.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/keyboard-export-k_handler.patch	Mon Jul  5 11:39:27 2010	(r15938)
@@ -0,0 +1,19 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: [PATCH] keyboard: Export k_handler again
+
+Commit 97f5f0cd8cd0a05449cbb77d1e6f02e026875802 "Input: implement
+SysRq as a separate input handler" removed the export of k_handler.
+However, speakup currently depends on this.
+
+--- a/drivers/char/keyboard.c
++++ b/drivers/char/keyboard.c
+@@ -81,7 +82,8 @@
+ typedef void (k_handler_fn)(struct vc_data *vc, unsigned char value,
+ 			    char up_flag);
+ static k_handler_fn K_HANDLERS;
++k_handler_fn *k_handler[16] = { K_HANDLERS };
++EXPORT_SYMBOL_GPL(k_handler);
+-static k_handler_fn *k_handler[16] = { K_HANDLERS };
+ 
+ #define FN_HANDLERS\
+ 	fn_null,	fn_enter,	fn_show_ptregs,	fn_show_mem,\

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sun Jul  4 21:24:28 2010	(r15937)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Mon Jul  5 11:39:27 2010	(r15938)
@@ -27,6 +27,8 @@
 + features/all/speakup/speakup-kbuild.patch
 # made manually
 + features/all/speakup/slab-build-fix.patch
+# speakup also needs this
++ debian/keyboard-export-k_handler.patch
 
 + bugfix/ia64/hardcode-arch-script-output.patch
 + bugfix/mips/disable-advansys.patch