From 54d5736502f74d6ec2123186535478d9bb433956 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 24 Aug 2011 17:28:38 +0100 Subject: [PATCH] --- yaml --- r: 267713 b: refs/heads/master c: 6aea1c364cde5b28b551844b7b8925f523310a18 h: refs/heads/master i: 267711: 9f9aceefd1f35b05f6dfeafa0e2cce6acf77d0aa v: v3 --- [refs] | 2 +- .../staging/iio/{trigger_consumer.h => iio_core_trigger.h} | 0 trunk/drivers/staging/iio/industrialio-core.c | 2 +- trunk/drivers/staging/iio/industrialio-trigger.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename trunk/drivers/staging/iio/{trigger_consumer.h => iio_core_trigger.h} (100%) diff --git a/[refs] b/[refs] index 3e6d1030e441..cff09beb11cb 100644 --- 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 b/trunk/drivers/staging/iio/iio_core_trigger.h similarity index 100% rename from trunk/drivers/staging/iio/trigger_consumer.h rename to 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 index cf268bc2ee1f..ed8a6df5bf42 100644 --- a/trunk/drivers/staging/iio/industrialio-core.c +++ b/trunk/drivers/staging/iio/industrialio-core.c @@ -22,8 +22,8 @@ #include #include #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 index 7012f8ce8fd2..8fafeb8a8b8a 100644 --- 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)