Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / usb / misc / rio500.c

diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c
index cc13ae61712a2a81915e6f0582ecc174ac8c90ed..4e23d3841b43df3a2ddd914181f6ccb581715c78 100644 (file)
--- a/drivers/usb/misc/rio500.c
+++ b/drivers/usb/misc/rio500.c
@@ -439,6 +439,7 @@ static const struct file_operations usb_rio_fops = {
        .unlocked_ioctl = ioctl_rio,
        .open =         open_rio,
        .release =      close_rio,
+       .llseek =       noop_llseek,
 };
 
 static struct usb_class_driver usb_rio_class = {