diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /drivers/char/keyboard.c | |
parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/keyboard.c')
-rw-r--r-- | drivers/char/keyboard.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 24f2656000e8..1b63acfc6c78 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <linux/vt_kern.h> | 39 | #include <linux/vt_kern.h> |
40 | #include <linux/sysrq.h> | 40 | #include <linux/sysrq.h> |
41 | #include <linux/input.h> | 41 | #include <linux/input.h> |
42 | #include <linux/reboot.h> | ||
42 | 43 | ||
43 | static void kbd_disconnect(struct input_handle *handle); | 44 | static void kbd_disconnect(struct input_handle *handle); |
44 | extern void ctrl_alt_del(void); | 45 | extern void ctrl_alt_del(void); |