diff options
| author | Jonathan Cameron | 2011-08-24 18:28:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-08-24 23:23:43 +0200 |
| commit | 6aea1c364cde5b28b551844b7b8925f523310a18 (patch) | |
| tree | 6b8d8f76af0db0355dcf4c6503ee040c842fcfd0 | |
| parent | staging:iio: prevent removal of module connected to trigger. (diff) | |
| download | kernel-qcow2-linux-6aea1c364cde5b28b551844b7b8925f523310a18.tar.gz kernel-qcow2-linux-6aea1c364cde5b28b551844b7b8925f523310a18.tar.xz kernel-qcow2-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>
| -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.c | 2 | ||||
| -rw-r--r-- | drivers/staging/iio/industrialio-trigger.c | 2 |
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) |