Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

[~andy/linux] / drivers / sbus / char / envctrl.c

diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index 078e5f4520effe3a9e75c3249495574c1de0dff8..8ce414e39489495f9da40f84fa08630ac2beb215 100644 (file)
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -720,6 +720,7 @@ static const struct file_operations envctrl_fops = {
 #endif
        .open =                 envctrl_open,
        .release =              envctrl_release,
+       .llseek =               noop_llseek,
 };     
 
 static struct miscdevice envctrl_dev = {