Merge branch 'master' into csb1725

[mv-sheeva.git] / net / rfkill / core.c

diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 51875a0c5d48c489899e1bcb71c3fd2a2fd3c91c..04f599089e6d1bdc64d3625c288fc132b3cd621a 100644 (file)
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -1241,6 +1241,7 @@ static const struct file_operations rfkill_fops = {
        .unlocked_ioctl = rfkill_fop_ioctl,
        .compat_ioctl   = rfkill_fop_ioctl,
 #endif
+       .llseek         = no_llseek,
 };
 
 static struct miscdevice rfkill_miscdev = {