Merge v2.6.37-rc8 into powerpc/next

[firefly-linux-kernel-4.4.55.git] / drivers / input / misc / uinput.c

diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 360698553eb55d2d1f1b84f912dbc6984eb606bd..b9410784e6a1f1503fb57a720c9f91b1fcec2fce 100644 (file)
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -811,6 +811,7 @@ static const struct file_operations uinput_fops = {
 #ifdef CONFIG_COMPAT
        .compat_ioctl   = uinput_compat_ioctl,
 #endif
+       .llseek         = no_llseek,
 };
 
 static struct miscdevice uinput_misc = {