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/misc/idmouse.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/misc/idmouse.c')
| -rw-r--r-- | drivers/usb/misc/idmouse.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index a54c3cb804ce..c6184b4d1695 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c | |||
| @@ -105,6 +105,7 @@ static const struct file_operations idmouse_fops = { | |||
| 105 | .read = idmouse_read, | 105 | .read = idmouse_read, |
| 106 | .open = idmouse_open, | 106 | .open = idmouse_open, |
| 107 | .release = idmouse_release, | 107 | .release = idmouse_release, |
| 108 | .llseek = default_llseek, | ||
| 108 | }; | 109 | }; |
| 109 | 110 | ||
| 110 | /* class driver information */ | 111 | /* class driver information */ |