Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[sfrench/cifs-2.6.git] / drivers / char / keyboard.c

diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index d9a0a53c842d2f35632a069591d148bfc843c2d9..7b3a212c86b1ab21d5e3d783716ded2787f3729d 100644 (file)
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -46,6 +46,8 @@
 
 extern void ctrl_alt_del(void);
 
+#define to_handle_h(n) container_of(n, struct input_handle, h_node)
+
 /*
  * Exported functions/variables
  */