Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / char / mspec.c

diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c
index ecb89d798e3553bffe2044cd27e0ed7aa608729b..966a95bc974b2c0489c7c4f33b52d1b3872238a0 100644 (file)
--- a/drivers/char/mspec.c
+++ b/drivers/char/mspec.c
@@ -316,7 +316,8 @@ uncached_mmap(struct file *file, struct vm_area_struct *vma)
 
 static const struct file_operations fetchop_fops = {
        .owner = THIS_MODULE,
-       .mmap = fetchop_mmap
+       .mmap = fetchop_mmap,
+       .llseek = noop_llseek,
 };
 
 static struct miscdevice fetchop_miscdev = {
@@ -327,7 +328,8 @@ static struct miscdevice fetchop_miscdev = {
 
 static const struct file_operations cached_fops = {
        .owner = THIS_MODULE,
-       .mmap = cached_mmap
+       .mmap = cached_mmap,
+       .llseek = noop_llseek,
 };
 
 static struct miscdevice cached_miscdev = {
@@ -338,7 +340,8 @@ static struct miscdevice cached_miscdev = {
 
 static const struct file_operations uncached_fops = {
        .owner = THIS_MODULE,
-       .mmap = uncached_mmap
+       .mmap = uncached_mmap,
+       .llseek = noop_llseek,
 };
 
 static struct miscdevice uncached_miscdev = {