diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 16:21:02 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 16:21:02 -0400 |
| commit | e4ddcb0a6bf04d53ce77b4eb87bbbb32c4261d11 (patch) | |
| tree | d27d2fea50a384d97aa2d0cf5c8657c916f761d4 /drivers/input/serio | |
| parent | f2afa7711f8585ffc088ba538b9a510e0d5dca12 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
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 @@ | |||
| 67 | #include <linux/module.h> | 67 | #include <linux/module.h> |
| 68 | #include <linux/ioport.h> | 68 | #include <linux/ioport.h> |
| 69 | #include <linux/time.h> | 69 | #include <linux/time.h> |
| 70 | #include <linux/semaphore.h> | ||
| 70 | #include <linux/slab.h> | 71 | #include <linux/slab.h> |
| 71 | #include <linux/hil.h> | 72 | #include <linux/hil.h> |
| 72 | #include <linux/semaphore.h> | ||
| 73 | #include <asm/io.h> | 73 | #include <asm/io.h> |
| 74 | #include <asm/system.h> | 74 | #include <asm/system.h> |
| 75 | 75 | ||