On 05/11/11 12:58, michael.hennerich@xxxxxxxxxx wrote: > From: Michael Hennerich <michael.hennerich@xxxxxxxxxx> > > Add channel types IIO_CURRENT and IIO_POWER. > This is required for the ADE7758 driver cleanup. Will slot this one in right before the ade7758 patches. > > Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx> Acked-by: Jonathan Cameron <jic23@xxxxxxxxx> > --- > drivers/staging/iio/iio.h | 2 ++ > drivers/staging/iio/industrialio-core.c | 2 ++ > 2 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h > index d9f2692..80a81d4 100644 > --- a/drivers/staging/iio/iio.h > +++ b/drivers/staging/iio/iio.h > @@ -30,6 +30,8 @@ > enum iio_chan_type { > /* real channel types */ > IIO_IN, > + IIO_CURRENT, > + IIO_POWER, > IIO_ACCEL, > IIO_IN_DIFF, > IIO_GYRO, > diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c > index faa34af..9218fee 100644 > --- a/drivers/staging/iio/industrialio-core.c > +++ b/drivers/staging/iio/industrialio-core.c > @@ -47,6 +47,8 @@ static const char * const iio_chan_type_name_spec_shared[] = { > [IIO_TIMESTAMP] = "timestamp", > [IIO_ACCEL] = "accel", > [IIO_IN] = "in", > + [IIO_CURRENT] = "current", > + [IIO_POWER] = "power", > [IIO_IN_DIFF] = "in-in", > [IIO_GYRO] = "gyro", > [IIO_TEMP] = "temp", -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html