summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2011-08-24 17:28:38 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-24 14:23:43 -0700
commit6aea1c364cde5b28b551844b7b8925f523310a18 (patch)
tree6b8d8f76af0db0355dcf4c6503ee040c842fcfd0 /drivers
parentf60c4a02aa05817f00408ecefdf221f44781e08a (diff)
downloadlinux-6aea1c364cde5b28b551844b7b8925f523310a18.tar.gz
linux-6aea1c364cde5b28b551844b7b8925f523310a18.tar.bz2
linux-6aea1c364cde5b28b551844b7b8925f523310a18.zip
staging:iio:rename trigger_consumer.h to indicate it is core only.
Need this out the way to create a trigger_consumer.h that actually is for trigger consumers. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/iio/iio_core_trigger.h (renamed from drivers/staging/iio/trigger_consumer.h)0
-rw-r--r--drivers/staging/iio/industrialio-core.c2
-rw-r--r--drivers/staging/iio/industrialio-trigger.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/iio/trigger_consumer.h b/drivers/staging/iio/iio_core_trigger.h
index 9d52d9637777..9d52d9637777 100644
--- a/drivers/staging/iio/trigger_consumer.h
+++ b/drivers/staging/iio/iio_core_trigger.h
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index cf268bc2ee1f..ed8a6df5bf42 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/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/drivers/staging/iio/industrialio-trigger.c b/drivers/staging/iio/industrialio-trigger.c
index 7012f8ce8fd2..8fafeb8a8b8a 100644
--- a/drivers/staging/iio/industrialio-trigger.c
+++ b/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)