---

yaml --- r: 317727 b: refs/heads/master c: cf82cb8 h: refs/heads/master i: 317725: 1d64e2d 317723: 3f02af5 317719: 92b743b 317711: dfd3c1e 317695: 6bd2b17 v: v3
git-mirror · Jun 30, 2012 · d1cc9ef · d1cc9ef
1 parent 3f989ef
commit d1cc9ef
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: f699d10202d50a764614ff9191b5c4b9dd75e36c
+refs/heads/master: cf82cb8128496955a38fa62e1819ceb1d596e2eb
diff --git a/trunk/drivers/iio/industrialio-core.c b/trunk/drivers/iio/industrialio-core.c
@@ -71,6 +71,7 @@ static const char * const iio_modifier_names[] = {
 	[IIO_MOD_Y] = "y",
 	[IIO_MOD_Z] = "z",
 	[IIO_MOD_ROOT_SUM_SQUARED_X_Y] = "sqrt(x^2+y^2)",
+	[IIO_MOD_SUM_SQUARED_X_Y_Z] = "x^2+y^2+z^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
@@ -45,6 +45,7 @@ enum iio_modifier {
 	IIO_MOD_LIGHT_BOTH,
 	IIO_MOD_LIGHT_IR,
 	IIO_MOD_ROOT_SUM_SQUARED_X_Y,
+	IIO_MOD_SUM_SQUARED_X_Y_Z,
 };
 
 #define IIO_VAL_INT 1