Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile

[~andy/linux] / drivers / staging / iio / trigger_consumer.h

diff --git a/drivers/staging/iio/trigger_consumer.h b/drivers/staging/iio/trigger_consumer.h
index 418e0bd5f4ce7edb9475f17f91db2c51f4ab65fa..60d64b3569458a7f33c96ea27caa4df908ca9d59 100644 (file)
--- a/drivers/staging/iio/trigger_consumer.h
+++ b/drivers/staging/iio/trigger_consumer.h
@@ -48,5 +48,5 @@ void iio_trigger_notify_done(struct iio_trigger *trig);
  * Two functions for common case where all that happens is a pollfunc
  * is attached and detached from a trigger
  */
-int iio_triggered_ring_postenable(struct iio_dev *indio_dev);
-int iio_triggered_ring_predisable(struct iio_dev *indio_dev);
+int iio_triggered_buffer_postenable(struct iio_dev *indio_dev);
+int iio_triggered_buffer_predisable(struct iio_dev *indio_dev);