diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:24:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:24:40 -0700 |
| commit | 7540081c6b16dc941895bca840749cabfd0d3b48 (patch) | |
| tree | 9e6b2270d700bf99489b570aa2b4c2c0b6cd0ead /drivers/input/keyboard/hil_kbd.c | |
| parent | 3fde80e94c2bbffbb13f5faa3340cf438440ebea (diff) | |
| parent | b552068999b0b05087c454e525b30b785c79dc9b (diff) | |
Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
Remove __DECLARE_SEMAPHORE_GENERIC
Remove asm/semaphore.h
Remove use of asm/semaphore.h
Add missing semaphore.h includes
Remove mention of semaphores from kernel-locking
Diffstat (limited to 'drivers/input/keyboard/hil_kbd.c')
| -rw-r--r-- | drivers/input/keyboard/hil_kbd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c index adbf29f0169..71c1971abf8 100644 --- a/drivers/input/keyboard/hil_kbd.c +++ b/drivers/input/keyboard/hil_kbd.c @@ -37,6 +37,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> +#include <linux/semaphore.h> #include <linux/slab.h> #include <linux/pci_ids.h> |