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/image/mdc800.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/image/mdc800.c')
| -rw-r--r-- | drivers/usb/image/mdc800.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c index e192e8f7c560..575b56c79e97 100644 --- a/drivers/usb/image/mdc800.c +++ b/drivers/usb/image/mdc800.c | |||
| @@ -963,6 +963,7 @@ static const struct file_operations mdc800_device_ops = | |||
| 963 | .write = mdc800_device_write, | 963 | .write = mdc800_device_write, |
| 964 | .open = mdc800_device_open, | 964 | .open = mdc800_device_open, |
| 965 | .release = mdc800_device_release, | 965 | .release = mdc800_device_release, |
| 966 | .llseek = noop_llseek, | ||
| 966 | }; | 967 | }; |
| 967 | 968 | ||
| 968 | 969 | ||