---

yaml --- r: 267713 b: refs/heads/master c: 6aea1c3 h: refs/heads/master i: 267711: 9f9acee v: v3
git-mirror · Aug 24, 2011 · 54d5736 · 54d5736
1 parent d5cb205
commit 54d5736
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f60c4a02aa05817f00408ecefdf221f44781e08a
+refs/heads/master: 6aea1c364cde5b28b551844b7b8925f523310a18
diff --git a/trunk/drivers/staging/iio/trigger_consumer.h → trunk/drivers/staging/iio/iio_core_trigger.h b/trunk/drivers/staging/iio/trigger_consumer.h → trunk/drivers/staging/iio/iio_core_trigger.h
diff --git a/trunk/drivers/staging/iio/industrialio-core.c b/trunk/drivers/staging/iio/industrialio-core.c
@@ -22,8 +22,8 @@
 #include <linux/cdev.h>
 #include <linux/slab.h>
 #include "iio.h"
-#include "trigger_consumer.h"
 #include "iio_core.h"
+#include "iio_core_trigger.h"
 
 #define IIO_ID_PREFIX "device"
 #define IIO_ID_FORMAT IIO_ID_PREFIX "%d"

diff --git a/trunk/drivers/staging/iio/industrialio-trigger.c b/trunk/drivers/staging/iio/industrialio-trigger.c
@@ -18,7 +18,7 @@
 #include "iio.h"
 #include "trigger.h"
 #include "iio_core.h"
-#include "trigger_consumer.h"
+#include "iio_core_trigger.h"
 
 /* RFC - Question of approach
  * Make the common case (single sensor single trigger)