Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

[mv-sheeva.git] / drivers / input / joydev.c

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 22239e9884988139df3228a50db421f337818355..9d424cebfd2c7d6e31e3cd433342e94f6fc7625c 100644 (file)
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -739,6 +739,7 @@ static const struct file_operations joydev_fops = {
        .compat_ioctl   = joydev_compat_ioctl,
 #endif
        .fasync         = joydev_fasync,
+       .llseek         = no_llseek,
 };
 
 static int joydev_install_chrdev(struct joydev *joydev)