Merge branch 'xen/dev-evtchn' into upstream/evtchn

[~andy/linux] / drivers / char / uv_mmtimer.c

diff --git a/drivers/char/uv_mmtimer.c b/drivers/char/uv_mmtimer.c
index c7072ba14f48130d8f04977232bb38ed8dbe067e..493b47a0d511bd1a01dcd8985b76666f66a03971 100644 (file)
--- a/drivers/char/uv_mmtimer.c
+++ b/drivers/char/uv_mmtimer.c
@@ -52,6 +52,7 @@ static const struct file_operations uv_mmtimer_fops = {
        .owner = THIS_MODULE,
        .mmap = uv_mmtimer_mmap,
        .unlocked_ioctl = uv_mmtimer_ioctl,
+       .llseek = noop_llseek,
 };
 
 /**