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

[pandora-kernel.git] / drivers / hid / hid-debug.c

diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index adff4ef..75c5e23 100644 (file)
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -1053,6 +1053,7 @@ static const struct file_operations hid_debug_events_fops = {
        .read           = hid_debug_events_read,
        .poll           = hid_debug_events_poll,
        .release        = hid_debug_events_release,
+       .llseek         = noop_llseek,
 };