---

yaml --- r: 354485 b: refs/heads/master c: aaa3002 h: refs/heads/master i: 354483: ba23eb9 v: v3
git-mirror · Feb 9, 2013 · 36919da · 36919da
1 parent 52e9675
commit 36919da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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_ */