diff --git a/[refs] b/[refs] index 23949c5e3606..e076e4839cda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20caa14c59dfda3f4be75530e08e439ad2e73580 +refs/heads/master: 0abd242839eac8437521101c9361c095728eded3 diff --git a/trunk/drivers/staging/iio/industrialio-core.c b/trunk/drivers/staging/iio/industrialio-core.c index 406f8613c7af..cefeb647b81b 100644 --- a/trunk/drivers/staging/iio/industrialio-core.c +++ b/trunk/drivers/staging/iio/industrialio-core.c @@ -59,7 +59,7 @@ EXPORT_SYMBOL(__iio_change_event); * are queued. Hence a client MUST open the chrdev before the ring buffer is * switched on. */ - int __iio_push_event(struct iio_event_interface *ev_int, +int __iio_push_event(struct iio_event_interface *ev_int, int ev_code, s64 timestamp, struct iio_shared_ev_pointer * diff --git a/trunk/drivers/staging/iio/industrialio-ring.c b/trunk/drivers/staging/iio/industrialio-ring.c index 8c2f3fa406d3..edcf6be99ccb 100644 --- a/trunk/drivers/staging/iio/industrialio-ring.c +++ b/trunk/drivers/staging/iio/industrialio-ring.c @@ -325,7 +325,7 @@ ssize_t iio_read_ring_length(struct device *dev, } EXPORT_SYMBOL(iio_read_ring_length); - ssize_t iio_write_ring_length(struct device *dev, +ssize_t iio_write_ring_length(struct device *dev, struct device_attribute *attr, const char *buf, size_t len)