Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / drivers / char / sysrq.c

diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index f0ad694cc2eb4abe3f9f9ca1544f6ab964a4e3dd..eaa5d3efa79da4cb061b4fbaf9d6acb6f21afd5e 100644 (file)
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -781,6 +781,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
 
 static const struct file_operations proc_sysrq_trigger_operations = {
        .write          = write_sysrq_trigger,
+       .llseek         = noop_llseek,
 };
 
 static void sysrq_init_procfs(void)