Merge branch 'master' into csb1725

[mv-sheeva.git] / net / ipv4 / tcp_probe.c

diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
index f8efada580e8fed87b33ea52f27f415034a4d62e..6211e211417396f9c17dedf805998db731b4a27c 100644 (file)
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
@@ -214,6 +214,7 @@ static const struct file_operations tcpprobe_fops = {
        .owner   = THIS_MODULE,
        .open    = tcpprobe_open,
        .read    = tcpprobe_read,
+       .llseek  = noop_llseek,
 };
 
 static __init int tcpprobe_init(void)