Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[cascardo/linux.git] / drivers / input / joydev.c

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 22239e9..3182c9c 100644 (file)
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -10,6 +10,8 @@
  * (at your option) any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <asm/io.h>
 #include <asm/system.h>
 #include <linux/delay.h>
@@ -739,6 +741,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)
@@ -805,7 +808,7 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
                        break;
 
        if (minor == JOYDEV_MINORS) {
-               printk(KERN_ERR "joydev: no more free joydev devices\n");
+               pr_err("no more free joydev devices\n");
                return -ENFILE;
        }