aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-02 20:26:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-02 20:26:32 -0700
commit497ff0344432d1c4ab493ce163a87410064b8d91 (patch)
treefbb4f5038622f475bf40d61047b3c3cf44a3d068 /include
parent5933f2ae353a93b1d3b501bc63c925531849bbc7 (diff)
parentbf283707d5fb174ec09215ae19860ad04ba7b67a (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wm831x-ts - move BTN_TOUCH reporting to data transfer Input: wm831x-ts - allow IRQ flags to be specified Input: wm831x-ts - fix races with IRQ management
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/wm831x/pdata.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
index afe4db49402d..632d1567a1b6 100644
--- a/include/linux/mfd/wm831x/pdata.h
+++ b/include/linux/mfd/wm831x/pdata.h
@@ -81,7 +81,9 @@ struct wm831x_touch_pdata {
int rpu; /** Pen down sensitivity resistor divider */
int pressure; /** Report pressure (boolean) */
unsigned int data_irq; /** Touch data ready IRQ */
+ int data_irqf; /** IRQ flags for data ready IRQ */
unsigned int pd_irq; /** Touch pendown detect IRQ */
+ int pd_irqf; /** IRQ flags for pen down IRQ */
};
enum wm831x_watchdog_action {

Privacy Policy