Merge branches 'upstream' and 'upstream-fixes' into for-linus

[mv-sheeva.git] / drivers / hid / usbhid / hiddev.c

diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 19ed90c8f5037311d6fa1ee206f3d2d10b6d0b6b..fedd88df9a18477de2699cb07e48feade407312f 100644 (file)
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -845,6 +845,7 @@ static const struct file_operations hiddev_fops = {
 #ifdef CONFIG_COMPAT
        .compat_ioctl   = hiddev_compat_ioctl,
 #endif
+       .llseek         = noop_llseek,
 };
 
 static char *hiddev_devnode(struct device *dev, mode_t *mode)