Merge branch 'master' into tk71

[mv-sheeva.git] / net / dccp / probe.c

diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 078e48d442fd2df6c5e500b2db4958df7a82a534..33d0e6297c213810a71beeb29f17c3c928727ff3 100644 (file)
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -149,6 +149,7 @@ static const struct file_operations dccpprobe_fops = {
        .owner   = THIS_MODULE,
        .open    = dccpprobe_open,
        .read    = dccpprobe_read,
+       .llseek  = noop_llseek,
 };
 
 static __init int dccpprobe_init(void)