diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-06-17 16:02:44 (GMT) |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-06-17 16:02:44 (GMT) |
| commit | 15439dd37f92f930ac7fc65a4f261834e4215bb0 (patch) | |
| tree | ec8e4a7cffd1cbb55ae4970c3172fa9a6fb0c0f7 /drivers/input/misc/apanel.c | |
| parent | 39ab9ddeb3e9573a1ea9a17a1431ea5c81681964 (diff) | |
| parent | 90d95ef617a535a8832bdcb8dee07bf591e5dd82 (diff) | |
| download | linux-15439dd37f92f930ac7fc65a4f261834e4215bb0.tar.xz | |
Merge branch 'for-linus' into next
Conflicts:
drivers/input/mouse/appletouch.c
Diffstat (limited to 'drivers/input/misc/apanel.c')
| -rw-r--r-- | drivers/input/misc/apanel.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/misc/apanel.c b/drivers/input/misc/apanel.c index 9531d8c..d82f7f7 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> |