diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-12 19:41:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-12 19:41:23 -0400 |
| commit | 011e3c63251be832d23df9f0697626ab7b354d02 (patch) | |
| tree | 2cad5b58c274c93ae49d9b58fb15d784d4dfd78f /drivers/input/mouse/gpio_mouse.c | |
| parent | c1412fce7eccae62b4de22494f6ab3ff8a90c0c6 (diff) | |
| parent | ecca5c3acc0d0933d89abc44e60afb0cc8170e35 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/input/mouse/gpio_mouse.c')
| -rw-r--r-- | drivers/input/mouse/gpio_mouse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c index a9ad8e1402b..39fe9b737ca 100644 --- a/drivers/input/mouse/gpio_mouse.c +++ b/drivers/input/mouse/gpio_mouse.c | |||
| @@ -12,9 +12,9 @@ | |||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/input-polldev.h> | 14 | #include <linux/input-polldev.h> |
| 15 | #include <linux/gpio.h> | ||
| 15 | #include <linux/gpio_mouse.h> | 16 | #include <linux/gpio_mouse.h> |
| 16 | 17 | ||
| 17 | #include <asm/gpio.h> | ||
| 18 | 18 | ||
| 19 | /* | 19 | /* |
| 20 | * Timer function which is run every scan_ms ms when the device is opened. | 20 | * Timer function which is run every scan_ms ms when the device is opened. |