diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/usb/class/usblp.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/usb/class/usblp.c')
| -rw-r--r-- | drivers/usb/class/usblp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c index e325162859b0..9eca4053312e 100644 --- a/drivers/usb/class/usblp.c +++ b/drivers/usb/class/usblp.c | |||
| @@ -1043,6 +1043,7 @@ static const struct file_operations usblp_fops = { | |||
| 1043 | .compat_ioctl = usblp_ioctl, | 1043 | .compat_ioctl = usblp_ioctl, |
| 1044 | .open = usblp_open, | 1044 | .open = usblp_open, |
| 1045 | .release = usblp_release, | 1045 | .release = usblp_release, |
| 1046 | .llseek = noop_llseek, | ||
| 1046 | }; | 1047 | }; |
| 1047 | 1048 | ||
| 1048 | static char *usblp_devnode(struct device *dev, mode_t *mode) | 1049 | static char *usblp_devnode(struct device *dev, mode_t *mode) |