diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-06-17 12:02:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-06-17 12:02:44 -0400 |
| commit | 15439dd37f92f930ac7fc65a4f261834e4215bb0 (patch) | |
| tree | ec8e4a7cffd1cbb55ae4970c3172fa9a6fb0c0f7 /drivers/input/misc | |
| parent | Input: pxa27x_keypad - add wakeup support (diff) | |
| parent | Input: appletouch - implement reset-resume logic (diff) | |
| download | linux-dev-15439dd37f92f930ac7fc65a4f261834e4215bb0.tar.xz linux-dev-15439dd37f92f930ac7fc65a4f261834e4215bb0.zip | |
Merge branch 'for-linus' into next
Conflicts:
drivers/input/mouse/appletouch.c
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/input/misc/apanel.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 3ad8bd9f7543..432699d61c58 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -15,7 +15,6 @@ if INPUT_MISC config INPUT_PCSPKR tristate "PC Speaker support" depends on PCSPKR_PLATFORM - depends on SND_PCSP=n help Say Y here if you want the standard PC Speaker to be used for bells and whistles. diff --git a/drivers/input/misc/apanel.c b/drivers/input/misc/apanel.c index 9531d8c7444f..d82f7f727f7a 100644 --- a/drivers/input/misc/apanel.c +++ b/drivers/input/misc/apanel.c @@ -20,7 +20,6 @@ #include <linux/module.h> #include <linux/ioport.h> #include <linux/io.h> -#include <linux/module.h> #include <linux/input-polldev.h> #include <linux/i2c.h> #include <linux/workqueue.h> |