Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / telephony / phonedev.c

diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c
index f3873f650bb43f7f68f79ee87a8c8cdf13784b3a..1915af2011757d581cee0e163052fd4b94c35e45 100644 (file)
--- a/drivers/telephony/phonedev.c
+++ b/drivers/telephony/phonedev.c
@@ -130,6 +130,7 @@ static const struct file_operations phone_fops =
 {
        .owner          = THIS_MODULE,
        .open           = phone_open,
+       .llseek         = noop_llseek,
 };
 
 /*