diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 16:24:32 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 16:24:32 +1000 |
commit | b1644c2cf251e1a51b1f42b81a24891660f44690 (patch) | |
tree | ef194434ff47f70231e06b698a38dd336f543d9c /drivers/input | |
parent | f5f6eda6b05b7754f061f6895ece73def730421a (diff) | |
parent | 597edb10b93886338dd41cd99ee26d4d4ab6eb0a (diff) |
Merge commit 'semaphore/semaphore'
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/keyboard/hil_kbd.c | 1 | ||||
-rw-r--r-- | drivers/input/misc/hp_sdc_rtc.c | 1 | ||||
-rw-r--r-- | drivers/input/serio/hp_sdc.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c index adbf29f0169d..71c1971abf80 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> diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c index 45e5d05b01de..fc378ab03380 100644 --- a/drivers/input/misc/hp_sdc_rtc.c +++ b/drivers/input/misc/hp_sdc_rtc.c @@ -43,6 +43,7 @@ #include <linux/proc_fs.h> #include <linux/poll.h> #include <linux/rtc.h> +#include <linux/semaphore.h> MODULE_AUTHOR("Brian S. Julin <bri@calyx.com>"); MODULE_DESCRIPTION("HP i8042 SDC + MSM-58321 RTC Driver"); diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c index edfedd9a166c..f8080f8f7700 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> |