Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / dvb / firewire / firedtv-ci.c

diff --git a/drivers/media/dvb/firewire/firedtv-ci.c b/drivers/media/dvb/firewire/firedtv-ci.c
index d3c2cf60de7613ff7ba44a93c811d7273d5cff07..8ffb565f0704112cb10c63edc6cafb0aed6a3cd0 100644 (file)
--- a/drivers/media/dvb/firewire/firedtv-ci.c
+++ b/drivers/media/dvb/firewire/firedtv-ci.c
@@ -220,6 +220,7 @@ static const struct file_operations fdtv_ca_fops = {
        .open           = dvb_generic_open,
        .release        = dvb_generic_release,
        .poll           = fdtv_ca_io_poll,
+       .llseek         = noop_llseek,
 };
 
 static struct dvb_device fdtv_ca = {