From 1d64e2dca4d2e6fec7d4b3e0d2df0a204e6933b5 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Sat, 5 May 2012 10:39:22 +0100 Subject: [PATCH] --- yaml --- r: 317725 b: refs/heads/master c: 8f5879b20be7f918cdc4b3d831cfd8f3dc02c74c h: refs/heads/master i: 317723: 3f02af58fd3ab1681521a839bfd584c564fc447b v: v3 --- [refs] | 2 +- trunk/drivers/iio/industrialio-core.c | 1 + trunk/include/linux/iio/types.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1ca44064606c..be39ac30ef83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07c7f79ee1c7e6288c614ba88005a8de6dbaadff +refs/heads/master: 8f5879b20be7f918cdc4b3d831cfd8f3dc02c74c diff --git a/trunk/drivers/iio/industrialio-core.c b/trunk/drivers/iio/industrialio-core.c index a5a446beb2fa..e42749ec5c3c 100644 --- a/trunk/drivers/iio/industrialio-core.c +++ b/trunk/drivers/iio/industrialio-core.c @@ -70,6 +70,7 @@ static const char * const iio_modifier_names[] = { [IIO_MOD_X] = "x", [IIO_MOD_Y] = "y", [IIO_MOD_Z] = "z", + [IIO_MOD_ROOT_SUM_SQUARED_X_Y] = "sqrt(x^2+y^2)", [IIO_MOD_LIGHT_BOTH] = "both", [IIO_MOD_LIGHT_IR] = "ir", }; diff --git a/trunk/include/linux/iio/types.h b/trunk/include/linux/iio/types.h index d086736a9033..210559ddf8a3 100644 --- a/trunk/include/linux/iio/types.h +++ b/trunk/include/linux/iio/types.h @@ -44,6 +44,7 @@ enum iio_modifier { IIO_MOD_X_OR_Y_OR_Z, IIO_MOD_LIGHT_BOTH, IIO_MOD_LIGHT_IR, + IIO_MOD_ROOT_SUM_SQUARED_X_Y, }; #define IIO_VAL_INT 1