Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

[deliverable/linux.git] / drivers / char / raw.c

diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 24b2b9160aa659ee1f8e0de3b13eabf2985db9d8..bfe25ea9766b94caf11ffbc5ca4fb3b766c2c188 100644 (file)
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -292,6 +292,7 @@ static const struct file_operations raw_fops = {
        .open           = raw_open,
        .release        = raw_release,
        .unlocked_ioctl = raw_ioctl,
+       .llseek         = default_llseek,
        .owner          = THIS_MODULE,
 };
 
@@ -302,6 +303,7 @@ static const struct file_operations raw_ctl_fops = {
 #endif
        .open           = raw_open,
        .owner          = THIS_MODULE,
+       .llseek         = noop_llseek,
 };
 
 static struct cdev raw_cdev;