Merge branch 'master' into csb1725

[mv-sheeva.git] / net / nonet.c

diff --git a/net/nonet.c b/net/nonet.c
index 92e76640c7cd65146dd6aed382698174f7a0f2a2..b1a73fda9c12ed4225f13b3b9ce4051950510025 100644 (file)
--- a/net/nonet.c
+++ b/net/nonet.c
@@ -22,4 +22,5 @@ static int sock_no_open(struct inode *irrelevant, struct file *dontcare)
 const struct file_operations bad_sock_fops = {
        .owner = THIS_MODULE,
        .open = sock_no_open,
+       .llseek = noop_llseek,
 };