diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
tree | 32e280957474f458901abfce16fa2a1687ef7497 /drivers/usb/misc/ldusb.c | |
parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'drivers/usb/misc/ldusb.c')
-rw-r--r-- | drivers/usb/misc/ldusb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c index dd41d8710043..edffef642337 100644 --- a/drivers/usb/misc/ldusb.c +++ b/drivers/usb/misc/ldusb.c | |||
@@ -613,6 +613,7 @@ static const struct file_operations ld_usb_fops = { | |||
613 | .open = ld_usb_open, | 613 | .open = ld_usb_open, |
614 | .release = ld_usb_release, | 614 | .release = ld_usb_release, |
615 | .poll = ld_usb_poll, | 615 | .poll = ld_usb_poll, |
616 | .llseek = no_llseek, | ||
616 | }; | 617 | }; |
617 | 618 | ||
618 | /* | 619 | /* |