diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:25:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:25:41 +0200 |
| commit | 9ae76f5d8ab546660cf517bb63c64de51800955d (patch) | |
| tree | e6470cb84456e71f5e7d9a0131b7720c61cb334e /drivers/input/misc | |
| parent | 948f984df52511bb0efa5c026813b0c34de43aa0 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into safe-poison-pointerstip-safe-poison-pointers-2008-06-16_09.25_Mon
Diffstat (limited to 'drivers/input/misc')
| -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 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> |