summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/hp_sdc.c
diff options
context:
space:
mode:
authorLinus Torvalds2008-07-24 21:24:40 +0200
committerLinus Torvalds2008-07-24 21:24:40 +0200
commit7540081c6b16dc941895bca840749cabfd0d3b48 (patch)
tree9e6b2270d700bf99489b570aa2b4c2c0b6cd0ead /drivers/input/serio/hp_sdc.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ger... (diff)
parentRemove __DECLARE_SEMAPHORE_GENERIC (diff)
downloadkernel-qcow2-linux-7540081c6b16dc941895bca840749cabfd0d3b48.tar.gz
kernel-qcow2-linux-7540081c6b16dc941895bca840749cabfd0d3b48.tar.xz
kernel-qcow2-linux-7540081c6b16dc941895bca840749cabfd0d3b48.zip
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/serio/hp_sdc.c')
-rw-r--r--drivers/input/serio/hp_sdc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 7b233a492ad5..aad664d5259f 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -67,6 +67,7 @@
#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>