diff --git a/[refs] b/[refs]
index 8541b234f920..ca7ae475208e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3bf812e321f2135769b6646f9dc89011a1bb383
+refs/heads/master: ccea5e1d0f393df38c23034d97e939b2f5c9d6bc
diff --git a/trunk/drivers/staging/iio/ring_sw.h b/trunk/drivers/staging/iio/ring_sw.h
index 7c27e2c70f77..61f1ed650392 100644
--- a/trunk/drivers/staging/iio/ring_sw.h
+++ b/trunk/drivers/staging/iio/ring_sw.h
@@ -220,8 +220,6 @@ void iio_sw_poll_func_th(struct iio_dev *indio_dev, s64 time);
 void iio_sw_trigger_bh_to_ring(struct work_struct *work_s);
 
 #else /* CONFIG_IIO_RING_BUFFER*/
-static inline void iio_ring_sw_register_funcs(struct iio_ring_access_funcs *ra)
-{};
 struct iio_sw_ring_helper_state {
 	struct iio_dev			*indio_dev;
 };