Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

[linux-flexiantxendom0-3.2.10.git] / drivers / telephony / ixj.c

diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index b1e4699..0d236f4 100644 (file)
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -6677,7 +6677,8 @@ static const struct file_operations ixj_fops =
         .poll           = ixj_poll,
         .unlocked_ioctl = ixj_ioctl,
         .release        = ixj_release,
-        .fasync         = ixj_fasync
+        .fasync         = ixj_fasync,
+        .llseek         = default_llseek,
 };
 
 static int ixj_linetest(IXJ *j)