diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-03-29 13:16:04 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-03-29 13:16:04 -0400 |
| commit | 2533c2cfbff8f0ee53b8448d6362b54c272125aa (patch) | |
| tree | e254f804f2da2f79e66ea71a1e534574ae9da2ac /drivers/input/serio | |
| parent | a2cb960f171228e17a28ff734289be60b75417c7 (diff) | |
| parent | 21235bdb8aa5e8320b08f79525a45185a52b07df (diff) | |
Merge branch 'fixes-gpio-to-irq' into fixes
Conflicts:
arch/arm/mach-omap1/board-htcherald.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/plat-omap/include/plat/gpio.h
drivers/input/serio/ams_delta_serio.c
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/ams_delta_serio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c index bd5b10eeeb40..f5fbdf94de3b 100644 --- a/drivers/input/serio/ams_delta_serio.c +++ b/drivers/input/serio/ams_delta_serio.c | |||
| @@ -184,7 +184,7 @@ module_init(ams_delta_serio_init); | |||
| 184 | static void __exit ams_delta_serio_exit(void) | 184 | static void __exit ams_delta_serio_exit(void) |
| 185 | { | 185 | { |
| 186 | serio_unregister_port(ams_delta_serio); | 186 | serio_unregister_port(ams_delta_serio); |
| 187 | free_irq(OMAP_GPIO_IRQ(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), 0); | 187 | free_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), 0); |
| 188 | gpio_free_array(ams_delta_gpios, | 188 | gpio_free_array(ams_delta_gpios, |
| 189 | ARRAY_SIZE(ams_delta_gpios)); | 189 | ARRAY_SIZE(ams_delta_gpios)); |
| 190 | } | 190 | } |