summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-28 10:27:16 +0000
committerArnd Bergmann <arnd@arndb.de>2011-12-28 10:27:16 +0000
commitd7bd1b8a6104bcdc53611689fec8715a236a22c8 (patch)
treeab13f2a62b39099f7c366cdcf1980ea9ee1348e1 /drivers/input
parenta46117836e23f97cf4660b0ebf8404ad151fb63d (diff)
parentb5d798cc7a221aec50baf496c482280f1b809143 (diff)
downloadlinux-d7bd1b8a6104bcdc53611689fec8715a236a22c8.tar.bz2
Merge branch 'drivers/pxa-gpio' into next/drivers
* drivers/pxa-gpio: Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq() pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/zylonite-wm97xx.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/zylonite-wm97xx.c b/drivers/input/touchscreen/zylonite-wm97xx.c
index f6328c0cded6..0a707bbbbea6 100644
--- a/drivers/input/touchscreen/zylonite-wm97xx.c
+++ b/drivers/input/touchscreen/zylonite-wm97xx.c
@@ -22,6 +22,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/delay.h>
+#include <linux/gpio.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/io.h>
@@ -192,8 +193,8 @@ static int zylonite_wm97xx_probe(struct platform_device *pdev)
else
gpio_touch_irq = mfp_to_gpio(MFP_PIN_GPIO26);
- wm->pen_irq = IRQ_GPIO(gpio_touch_irq);
- irq_set_irq_type(IRQ_GPIO(gpio_touch_irq), IRQ_TYPE_EDGE_BOTH);
+ wm->pen_irq = gpio_to_irq(gpio_touch_irq);
+ irq_set_irq_type(wm->pen_irq, IRQ_TYPE_EDGE_BOTH);
wm97xx_config_gpio(wm, WM97XX_GPIO_13, WM97XX_GPIO_IN,
WM97XX_GPIO_POL_HIGH,