diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 16:21:02 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 16:21:02 -0400 |
| commit | e4ddcb0a6bf04d53ce77b4eb87bbbb32c4261d11 (patch) | |
| tree | d27d2fea50a384d97aa2d0cf5c8657c916f761d4 /drivers/input/touchscreen/mainstone-wm97xx.c | |
| parent | f2afa7711f8585ffc088ba538b9a510e0d5dca12 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into for-linus
Diffstat (limited to 'drivers/input/touchscreen/mainstone-wm97xx.c')
| -rw-r--r-- | drivers/input/touchscreen/mainstone-wm97xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c index a79f029b91c0..590a1379aa32 100644 --- a/drivers/input/touchscreen/mainstone-wm97xx.c +++ b/drivers/input/touchscreen/mainstone-wm97xx.c | |||
| @@ -198,7 +198,7 @@ static int wm97xx_acc_startup(struct wm97xx *wm) | |||
| 198 | switch (wm->id) { | 198 | switch (wm->id) { |
| 199 | case WM9705_ID2: | 199 | case WM9705_ID2: |
| 200 | wm->pen_irq = IRQ_GPIO(4); | 200 | wm->pen_irq = IRQ_GPIO(4); |
| 201 | set_irq_type(IRQ_GPIO(4), IRQT_BOTHEDGE); | 201 | set_irq_type(IRQ_GPIO(4), IRQ_TYPE_EDGE_BOTH); |
| 202 | break; | 202 | break; |
| 203 | case WM9712_ID2: | 203 | case WM9712_ID2: |
| 204 | case WM9713_ID2: | 204 | case WM9713_ID2: |