diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 22:21:02 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 22:21:02 +0200 |
| commit | e4ddcb0a6bf04d53ce77b4eb87bbbb32c4261d11 (patch) | |
| tree | d27d2fea50a384d97aa2d0cf5c8657c916f761d4 /drivers/input/serio | |
| parent | Input: paper over a bug in Synaptics X driver (diff) | |
| parent | Linux 2.6.27-rc1 (diff) | |
| download | linux-e4ddcb0a6bf04d53ce77b4eb87bbbb32c4261d11.tar.xz linux-e4ddcb0a6bf04d53ce77b4eb87bbbb32c4261d11.zip | |
Merge commit 'v2.6.27-rc1' into for-linus
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/hp_sdc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c index 7b233a492ad5..0d395979b2d1 100644 --- a/drivers/input/serio/hp_sdc.c +++ b/drivers/input/serio/hp_sdc.c @@ -67,9 +67,9 @@ #include <linux/module.h> #include <linux/ioport.h> #include <linux/time.h> +#include <linux/semaphore.h> #include <linux/slab.h> #include <linux/hil.h> -#include <linux/semaphore.h> #include <asm/io.h> #include <asm/system.h> |