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

[mv-sheeva.git] / drivers / infiniband / hw / ipath / ipath_file_ops.c

diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 65eb8929db22c69da11950ef0ee5e80913a9cc52..9292a15ad7c4885b3920724eeeb27b9765051bc4 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -40,7 +40,6 @@
 #include <linux/highmem.h>
 #include <linux/io.h>
 #include <linux/jiffies.h>
-#include <linux/smp_lock.h>
 #include <asm/pgtable.h>
 
 #include "ipath_kernel.h"
@@ -63,7 +62,8 @@ static const struct file_operations ipath_file_ops = {
        .open = ipath_open,
        .release = ipath_close,
        .poll = ipath_poll,
-       .mmap = ipath_mmap
+       .mmap = ipath_mmap,
+       .llseek = noop_llseek,
 };
 
 /*