Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / iio / industrialio-ring.c

diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c
index d393ace0b41b88a6424994030608634962738a11..9a98fcdbe1096d1e3c7b31f6b71a6908cf1d95c5 100644 (file)
--- a/drivers/staging/iio/industrialio-ring.c
+++ b/drivers/staging/iio/industrialio-ring.c
@@ -131,6 +131,7 @@ static const struct file_operations iio_ring_fileops = {
        .release = iio_ring_release,
        .open = iio_ring_open,
        .owner = THIS_MODULE,
+       .llseek = noop_llseek,
 };
 
 /**