diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-07 02:07:35 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-07 02:07:35 -0400 |
| commit | d763d5edf945eec47bd443b699f174976f0afc13 (patch) | |
| tree | 3e5cd46b9a783999716bf92176854f4f1215d930 /drivers/input/misc/apanel.c | |
| parent | 790e2a290b499b0400254e6870ec27969065d122 (diff) | |
| parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) | |
Merge branch 'linus' into tracing/mmiotrace
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 9531d8c7444f..d82f7f727f7a 100644 --- a/drivers/input/misc/apanel.c +++ b/drivers/input/misc/apanel.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/module.h> | ||
| 24 | #include <linux/input-polldev.h> | 23 | #include <linux/input-polldev.h> |
| 25 | #include <linux/i2c.h> | 24 | #include <linux/i2c.h> |
| 26 | #include <linux/workqueue.h> | 25 | #include <linux/workqueue.h> |