Merge branch 'master' into csb1725

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

diff --git a/drivers/char/uv_mmtimer.c b/drivers/char/uv_mmtimer.c
index c7072ba14f48130d8f04977232bb38ed8dbe067e..956ebe2080a584d4a8e7843a9e4110edbc15f7b6 100644 (file)
--- a/drivers/char/uv_mmtimer.c
+++ b/drivers/char/uv_mmtimer.c
@@ -23,7 +23,6 @@
 #include <linux/interrupt.h>
 #include <linux/time.h>
 #include <linux/math64.h>
-#include <linux/smp_lock.h>
 
 #include <asm/genapic.h>
 #include <asm/uv/uv_hub.h>
@@ -52,6 +51,7 @@ static const struct file_operations uv_mmtimer_fops = {
        .owner = THIS_MODULE,
        .mmap = uv_mmtimer_mmap,
        .unlocked_ioctl = uv_mmtimer_ioctl,
+       .llseek = noop_llseek,
 };
 
 /**