diff --git a/[refs] b/[refs] index c0968bb9d7b4..17990a641bd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c26cc89e8d758804499dcaa58ba7d2a993b954fe +refs/heads/master: ca7d1b32d2a0d4c62533b9401cf9ce4d14d183f7 diff --git a/trunk/drivers/staging/iio/Documentation/inkernel.txt b/trunk/drivers/staging/iio/Documentation/inkernel.txt index a05823e955d2..ab528409bba6 100644 --- a/trunk/drivers/staging/iio/Documentation/inkernel.txt +++ b/trunk/drivers/staging/iio/Documentation/inkernel.txt @@ -48,11 +48,11 @@ There are then a number of functions that can be used to get information about this channel such as it's current reading. e.g. -iio_st_read_channel_raw() - get a reading -iio_st_read_channel_type() - get the type of channel +iio_read_channel_raw() - get a reading +iio_get_channel_type() - get the type of channel There is also provision for retrieving all of the channels associated with a given consumer. This is useful for generic drivers such as iio_hwmon where the number and naming of channels is not known by the -consumer driver. To do this, use iio_st_channel_get_all. +consumer driver. To do this, use iio_channel_get_all.