summaryrefslogtreecommitdiffstats
path: root/include/linux/input
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-09-05 09:17:31 +0200
committerTakashi Iwai <tiwai@suse.de>2012-09-05 09:17:31 +0200
commit14e42917216ab0859827c2d8024df45a917301b4 (patch)
treeefbea5d1c54387d62a6fd66a21560232cf312fda /include/linux/input
parent292f2b6254c9dbb98def6d3521b07a837545ead0 (diff)
parent4266274836e81575ee82498d84f4bd08ab7a7378 (diff)
downloadblackbird-op-linux-14e42917216ab0859827c2d8024df45a917301b4.tar.gz
blackbird-op-linux-14e42917216ab0859827c2d8024df45a917301b4.zip
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-next
Diffstat (limited to 'include/linux/input')
-rw-r--r--include/linux/input/eeti_ts.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/input/eeti_ts.h b/include/linux/input/eeti_ts.h
index f875b316249d..16625d799b6f 100644
--- a/include/linux/input/eeti_ts.h
+++ b/include/linux/input/eeti_ts.h
@@ -2,6 +2,7 @@
#define LINUX_INPUT_EETI_TS_H
struct eeti_ts_platform_data {
+ int irq_gpio;
unsigned int irq_active_high;
};
OpenPOWER on IntegriCloud