---

yaml --- r: 317725 b: refs/heads/master c: 8f5879b h: refs/heads/master i: 317723: 3f02af5 v: v3
git-mirror · Jun 30, 2012 · 1d64e2d · 1d64e2d
1 parent dcec1ae
commit 1d64e2d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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