Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / scsi / osd / osd_uld.c

diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
index ffdd9fdb9995bcd158ae293e353fbaf99a19171f..b31a8e3841d795154672cad902ec628bafb59c6f 100644 (file)
--- a/drivers/scsi/osd/osd_uld.c
+++ b/drivers/scsi/osd/osd_uld.c
@@ -182,6 +182,7 @@ static const struct file_operations osd_fops = {
        .open           = osd_uld_open,
        .release        = osd_uld_release,
        .unlocked_ioctl = osd_uld_ioctl,
+       .llseek         = noop_llseek,
 };
 
 struct osd_dev *osduld_path_lookup(const char *name)