diff options
author | Dmitry Torokhov | 2011-01-07 07:34:59 +0100 |
---|---|---|
committer | Dmitry Torokhov | 2011-01-07 07:34:59 +0100 |
commit | 554738da71004d96e06fb75f4772dfc3b0f47810 (patch) | |
tree | 149a96ce3727025d3b9260961ec94ba8306db278 /drivers/input/serio/ams_delta_serio.c | |
parent | Input: wacom - add support for digitizer in Lenovo W700 (diff) | |
parent | Input: wacom_w8001 - support pen or touch only devices (diff) | |
download | kernel-qcow2-linux-554738da71004d96e06fb75f4772dfc3b0f47810.tar.gz kernel-qcow2-linux-554738da71004d96e06fb75f4772dfc3b0f47810.tar.xz kernel-qcow2-linux-554738da71004d96e06fb75f4772dfc3b0f47810.zip |
Merge branch 'next' into for-linus
Conflicts:
include/linux/input.h
Diffstat (limited to 'drivers/input/serio/ams_delta_serio.c')
-rw-r--r-- | drivers/input/serio/ams_delta_serio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c index 8f1770e1e08b..ebe955325677 100644 --- a/drivers/input/serio/ams_delta_serio.c +++ b/drivers/input/serio/ams_delta_serio.c @@ -172,6 +172,5 @@ static void __exit ams_delta_serio_exit(void) free_irq(OMAP_GPIO_IRQ(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), 0); gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_CLK); gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_DATA); - kfree(ams_delta_serio); } module_exit(ams_delta_serio_exit); |