From b08c8ed842ce5559715905147afce2daa8813f94 Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Wed, 18 May 2011 14:41:21 +0100
Subject: [PATCH] --- yaml --- r: 249795 b: refs/heads/master c:
 8384d9573e937949eba96eaa1323253c2687aa5c h: refs/heads/master i:   249793:
 470dc958b1cd075922d46f1f96ffb07c281080b7   249791:
 efdca3c4116f37e3ca324d803ad259f43ef00444 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/staging/iio/industrialio-trigger.c | 7 +++++++
 trunk/drivers/staging/iio/trigger.h              | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2e589de08aec..28682eec16db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0580032658c3b9c4e1ffca3a60a5c865a44cb36
+refs/heads/master: 8384d9573e937949eba96eaa1323253c2687aa5c
diff --git a/trunk/drivers/staging/iio/industrialio-trigger.c b/trunk/drivers/staging/iio/industrialio-trigger.c
index 5496ee272e2e..d045b6c32881 100644
--- a/trunk/drivers/staging/iio/industrialio-trigger.c
+++ b/trunk/drivers/staging/iio/industrialio-trigger.c
@@ -189,6 +189,13 @@ void iio_trigger_poll(struct iio_trigger *trig, s64 time)
 }
 EXPORT_SYMBOL(iio_trigger_poll);
 
+irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private)
+{
+	iio_trigger_poll(private, iio_get_time_ns());
+	return IRQ_HANDLED;
+}
+EXPORT_SYMBOL(iio_trigger_generic_data_rdy_poll);
+
 void iio_trigger_notify_done(struct iio_trigger *trig)
 {
 	trig->use_count--;
diff --git a/trunk/drivers/staging/iio/trigger.h b/trunk/drivers/staging/iio/trigger.h
index 0c44c5efd01f..8e25c004ebf3 100644
--- a/trunk/drivers/staging/iio/trigger.h
+++ b/trunk/drivers/staging/iio/trigger.h
@@ -127,6 +127,8 @@ int iio_trigger_dettach_poll_func(struct iio_trigger *trig,
 void iio_trigger_poll(struct iio_trigger *trig, s64 time);
 void iio_trigger_notify_done(struct iio_trigger *trig);
 
+irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private);
+
 static inline int iio_trigger_get_irq(struct iio_trigger *trig)
 {
 	int ret;