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

[mv-sheeva.git] / drivers / watchdog / cpwd.c

diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index b7d96e6236a17f929627f8fd714422f3a7c048bd..eca855a55c0d6abf96096e6b41847c93b06675db 100644 (file)
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -525,6 +525,7 @@ static const struct file_operations cpwd_fops = {
        .write =                cpwd_write,
        .read =                 cpwd_read,
        .release =              cpwd_release,
+       .llseek =               no_llseek,
 };
 
 static int __devinit cpwd_probe(struct platform_device *op,