From 369d34bf4d6b1dbfc13373cb2376d48494601cfc Mon Sep 17 00:00:00 2001
From: Michael Hennerich <michael.hennerich@analog.com>
Date: Mon, 16 May 2011 23:17:34 -0700
Subject: [PATCH] --- yaml --- r: 250519 b: refs/heads/master c:
 3532cb0ca2774b05e3c660f536ba3d1b38061fc9 h: refs/heads/master i:   250517:
 1385061762aee7e37cd9f53ebf52b4723ab0e813   250515:
 f04cf0988d9d4c2863d2f15d4d67008892a9a4ec   250511:
 3f52c268df09434a53f4b664514234abb0ee0643 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/input/misc/ad714x.c  | 4 +++-
 trunk/include/linux/input/ad714x.h | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9020b60467bf..fd78880cf075 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e223cc7e96ddbcd32c4a0314d42ae56ade8008e5
+refs/heads/master: 3532cb0ca2774b05e3c660f536ba3d1b38061fc9
diff --git a/trunk/drivers/input/misc/ad714x.c b/trunk/drivers/input/misc/ad714x.c
index 0f2db45f730c..5f683ec2999e 100644
--- a/trunk/drivers/input/misc/ad714x.c
+++ b/trunk/drivers/input/misc/ad714x.c
@@ -1257,7 +1257,9 @@ struct ad714x_chip *ad714x_probe(struct device *dev, u16 bus_type, int irq,
 	}
 
 	error = request_threaded_irq(ad714x->irq, NULL, ad714x_interrupt_thread,
-			IRQF_TRIGGER_FALLING, "ad714x_captouch", ad714x);
+				plat_data->irqflags ?
+					plat_data->irqflags : IRQF_TRIGGER_FALLING,
+				"ad714x_captouch", ad714x);
 	if (error) {
 		dev_err(dev, "can't allocate irq %d\n", ad714x->irq);
 		goto err_unreg_dev;
diff --git a/trunk/include/linux/input/ad714x.h b/trunk/include/linux/input/ad714x.h
index 0cbe5e81482e..d388d857bf14 100644
--- a/trunk/include/linux/input/ad714x.h
+++ b/trunk/include/linux/input/ad714x.h
@@ -6,7 +6,7 @@
  * The platform_data for the device's "struct device" holds this
  * information.
  *
- * Copyright 2009 Analog Devices Inc.
+ * Copyright 2009-2011 Analog Devices Inc.
  *
  * Licensed under the GPL-2 or later.
  */
@@ -58,6 +58,7 @@ struct ad714x_platform_data {
 	struct ad714x_button_plat *button;
 	unsigned short stage_cfg_reg[STAGE_NUM][STAGE_CFGREG_NUM];
 	unsigned short sys_cfg_reg[SYS_CFGREG_NUM];
+	unsigned long irqflags;
 };
 
 #endif