diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-04 21:39:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-04 21:39:31 -0500 |
| commit | c2cc87ca9561ddfe744d446789cc10f507e87db9 (patch) | |
| tree | d505fc0110eb1a3d8750ba2f67648c131f0d9aca /drivers/input/serio | |
| parent | ce1eeb95fc4eb25109c00bea3e83a87eeff6b07d (diff) | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/ct82c710.c | 1 | ||||
| -rw-r--r-- | drivers/input/serio/hp_sdc_mlc.c | 1 | ||||
| -rw-r--r-- | drivers/input/serio/i8042.c | 1 | ||||
| -rw-r--r-- | drivers/input/serio/maceps2.c | 2 | ||||
| -rw-r--r-- | drivers/input/serio/q40kbd.c | 1 | ||||
| -rw-r--r-- | drivers/input/serio/rpckbd.c | 1 |
6 files changed, 6 insertions, 1 deletions
diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c index dd0f5bd9024..4da6c86b5d7 100644 --- a/drivers/input/serio/ct82c710.c +++ b/drivers/input/serio/ct82c710.c @@ -37,6 +37,7 @@ #include <linux/serio.h> #include <linux/errno.h> #include <linux/err.h> +#include <linux/platform_device.h> #include <asm/io.h> diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c index e3c44ffae67..1c9426fd520 100644 --- a/drivers/input/serio/hp_sdc_mlc.c +++ b/drivers/input/serio/hp_sdc_mlc.c @@ -40,6 +40,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/string.h> +#include <asm/semaphore.h> #define PREFIX "HP SDC MLC: " diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 4bc40f15999..01e18642202 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -20,6 +20,7 @@ #include <linux/serio.h> #include <linux/err.h> #include <linux/rcupdate.h> +#include <linux/platform_device.h> #include <asm/io.h> diff --git a/drivers/input/serio/maceps2.c b/drivers/input/serio/maceps2.c index 9880fc145d9..d857f7081ad 100644 --- a/drivers/input/serio/maceps2.c +++ b/drivers/input/serio/maceps2.c @@ -14,7 +14,7 @@ #include <linux/interrupt.h> #include <linux/ioport.h> #include <linux/delay.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/err.h> diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c index 46093c50798..b44d255596c 100644 --- a/drivers/input/serio/q40kbd.c +++ b/drivers/input/serio/q40kbd.c @@ -37,6 +37,7 @@ #include <linux/interrupt.h> #include <linux/err.h> #include <linux/bitops.h> +#include <linux/platform_device.h> #include <asm/io.h> #include <asm/uaccess.h> diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c index 106f5eefd89..52c49258f8a 100644 --- a/drivers/input/serio/rpckbd.c +++ b/drivers/input/serio/rpckbd.c @@ -34,6 +34,7 @@ #include <linux/init.h> #include <linux/serio.h> #include <linux/err.h> +#include <linux/platform_device.h> #include <asm/irq.h> #include <asm/hardware.h> |