aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard/gpio_keys.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-31 00:55:22 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-31 00:55:22 -0400
commit644b55ce889edd37d6406df26e2d96d7a7390749 (patch)
tree9dc34216c5cf4c65d789fb2695289e09324558d4 /drivers/input/keyboard/gpio_keys.c
parentfeabb06bd70551668540f2305047675667f5f60f (diff)
parentb3e2c70cd0d05fb6621521521fbd5debed57d753 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: psmouse - make dummy touchkit_ps2_detect() static Input: gscps2 - convert to use kzalloc Input: iforce - fix 'unused variable' warning Input: i8042 - fix retrun value of i8042_aux_test_irq Input: gpio_keys - remove duplicate includes
Diffstat (limited to 'drivers/input/keyboard/gpio_keys.c')
-rw-r--r--drivers/input/keyboard/gpio_keys.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 739212252b09..f0b22b8b2769 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -22,7 +22,6 @@
22#include <linux/delay.h> 22#include <linux/delay.h>
23#include <linux/platform_device.h> 23#include <linux/platform_device.h>
24#include <linux/input.h> 24#include <linux/input.h>
25#include <linux/irq.h>
26#include <linux/gpio_keys.h> 25#include <linux/gpio_keys.h>
27 26
28#include <asm/gpio.h> 27#include <asm/gpio.h>