Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / media / dvb / ttpci / av7110_ir.c

diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index b070e88d8c6b3b7e14ae83dad807f2d33b259b1f..908f272fe26cc0b1c6ad8c4517c8342b1a94a44a 100644 (file)
--- 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
 static const struct file_operations av7110_ir_proc_fops = {
        .owner          = THIS_MODULE,
        .write          = av7110_ir_proc_write,
+       .llseek         = noop_llseek,
 };
 
 /* interrupt handler */