From 64721d5cea91f02be6c797516b62d5495e19986e Mon Sep 17 00:00:00 2001 From: Bryan Freed Date: Thu, 7 Jul 2011 12:01:55 -0700 Subject: [PATCH] --- yaml --- r: 260043 b: refs/heads/master c: f09f2c8142d275b0d9321d2ea93c8bd0d8dc32ec h: refs/heads/master i: 260041: e518800f320204108961f70eb005023a8816a719 260039: f5f9ca8745ab9cd14e97daf72b30067d7398b31c v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/industrialio-core.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 866ee4befbea..af17b2f333e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bff02f8f71c4366efd6f5d79150f9786884bd1c +refs/heads/master: f09f2c8142d275b0d9321d2ea93c8bd0d8dc32ec diff --git a/trunk/drivers/staging/iio/industrialio-core.c b/trunk/drivers/staging/iio/industrialio-core.c index 52a02af0f827..19819e7578c6 100644 --- a/trunk/drivers/staging/iio/industrialio-core.c +++ b/trunk/drivers/staging/iio/industrialio-core.c @@ -54,6 +54,7 @@ static const char * const iio_chan_type_name_spec_shared[] = { [IIO_MAGN] = "magn", [IIO_LIGHT] = "illuminance", [IIO_INTENSITY] = "intensity", + [IIO_PROXIMITY] = "proximity", [IIO_TEMP] = "temp", [IIO_INCLI] = "incli", [IIO_ROT] = "rot",