diff options
| author | Dmitry Torokhov | 2006-12-08 07:07:56 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2006-12-08 07:07:56 +0100 |
| commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
| tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /drivers/input/serio/serio.c | |
| parent | Input: handle errors from input_register_device in drivers/macintosh (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
| download | kernel-qcow2-linux-bef986502fa398b1785a3979b1aa17cd902d3527.tar.gz kernel-qcow2-linux-bef986502fa398b1785a3979b1aa17cd902d3527.tar.xz kernel-qcow2-linux-bef986502fa398b1785a3979b1aa17cd902d3527.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
Diffstat (limited to 'drivers/input/serio/serio.c')
| -rw-r--r-- | drivers/input/serio/serio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index 8c717042f611..f0ce822c1028 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c @@ -35,6 +35,7 @@ #include <linux/slab.h> #include <linux/kthread.h> #include <linux/mutex.h> +#include <linux/freezer.h> MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); MODULE_DESCRIPTION("Serio abstraction core"); |