From 36919daa390755115231588ff9b006360b1a9b98 Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@kernel.org>
Date: Sat, 9 Feb 2013 10:49:00 +0000
Subject: [PATCH] --- yaml --- r: 354485 b: refs/heads/master c:
 aaa300262c5912bda34c9cf871719209eae01b06 h: refs/heads/master i:   354483:
 ba23eb9e59a766f83bb9905bb113efb54a6b623c v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/iio/trigger.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d2226fc703a9..bffd41fb9378 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad6c46b0c712e0d8fd8a80ee372b30f14a781888
+refs/heads/master: aaa300262c5912bda34c9cf871719209eae01b06
diff --git a/trunk/include/linux/iio/trigger.h b/trunk/include/linux/iio/trigger.h
index 20239da1d0f7..c66e0a96f6e8 100644
--- a/trunk/include/linux/iio/trigger.h
+++ b/trunk/include/linux/iio/trigger.h
@@ -12,6 +12,7 @@
 #ifndef _IIO_TRIGGER_H_
 #define _IIO_TRIGGER_H_
 
+#ifdef CONFIG_IIO_TRIGGER
 struct iio_subirq {
 	bool enabled;
 };
@@ -117,4 +118,8 @@ irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private);
 __printf(1, 2) struct iio_trigger *iio_trigger_alloc(const char *fmt, ...);
 void iio_trigger_free(struct iio_trigger *trig);
 
+#else
+struct iio_trigger;
+struct iio_trigger_ops;
+#endif
 #endif /* _IIO_TRIGGER_H_ */