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/media/dvb/ttpci/av7110_ir.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/media/dvb/ttpci/av7110_ir.c')
| -rw-r--r-- | drivers/media/dvb/ttpci/av7110_ir.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c index b070e88d8c6b..908f272fe26c 100644 --- a/drivers/media/dvb/ttpci/av7110_ir.c +++ b/drivers/media/dvb/ttpci/av7110_ir.c | |||
| @@ -312,6 +312,7 @@ static ssize_t av7110_ir_proc_write(struct file *file, const char __user *buffer | |||
| 312 | static const struct file_operations av7110_ir_proc_fops = { | 312 | static const struct file_operations av7110_ir_proc_fops = { |
| 313 | .owner = THIS_MODULE, | 313 | .owner = THIS_MODULE, |
| 314 | .write = av7110_ir_proc_write, | 314 | .write = av7110_ir_proc_write, |
| 315 | .llseek = noop_llseek, | ||
| 315 | }; | 316 | }; |
| 316 | 317 | ||
| 317 | /* interrupt handler */ | 318 | /* interrupt handler */ |