Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / xen / xenfs / xenbus.c

diff --git a/drivers/xen/xenfs/xenbus.c b/drivers/xen/xenfs/xenbus.c
index 3b39c3752e21812976f10e393c8d0c6ecd15ea9a..1c1236087f785a20b1351e375b6ea4b9e1d1444e 100644 (file)
--- a/drivers/xen/xenfs/xenbus.c
+++ b/drivers/xen/xenfs/xenbus.c
@@ -594,4 +594,5 @@ const struct file_operations xenbus_file_ops = {
        .open = xenbus_file_open,
        .release = xenbus_file_release,
        .poll = xenbus_file_poll,
+       .llseek = no_llseek,
 };