diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-01-05 10:10:59 -0800 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-01-05 10:10:59 -0800 |
| commit | c4a8cecab6597381b0e82f7369e432d6a14530b7 (patch) | |
| tree | 4248f562509bb8890b603d004f408131b4ef5034 /drivers/iio/industrialio-core.c | |
| parent | 9197dc43519131ccd3241af1f04351468d989fe9 (diff) | |
| parent | 04c22768e7ed9962fdb3e458228213385d34d1f2 (diff) | |
| download | olio-linux-3.10-c4a8cecab6597381b0e82f7369e432d6a14530b7.tar.xz olio-linux-3.10-c4a8cecab6597381b0e82f7369e432d6a14530b7.zip | |
Merge branch 'android-3.10-bringup' of ssh://internal.oliodevices.com:29418/kernel/omap into android-3.10-bringup
Diffstat (limited to 'drivers/iio/industrialio-core.c')
| -rw-r--r-- | drivers/iio/industrialio-core.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 13515f40700..e145931ef1b 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -66,11 +66,6 @@ static const char * const iio_chan_type_name_spec[] = { [IIO_ALTVOLTAGE] = "altvoltage", [IIO_CCT] = "cct", [IIO_PRESSURE] = "pressure", - [IIO_HEARTRATE] = "heartrate", - [IIO_PEDOMETER] = "pedometer", - [IIO_PASSIVE] = "passive", - [IIO_GESTURE] = "gesture", - [IIO_FUSION] = "fusion", }; static const char * const iio_modifier_names[] = { |