Merge branch 'master' into tk71

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

diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
index 59359c9a5e01aafaaa43cba6c8a3fd1ca4842e1c..726b7df61fd08b366a728fb5be0c793235b4d585 100644 (file)
--- a/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@ -188,6 +188,7 @@ static const struct file_operations ep93xx_wdt_fops = {
        .unlocked_ioctl = ep93xx_wdt_ioctl,
        .open           = ep93xx_wdt_open,
        .release        = ep93xx_wdt_release,
+       .llseek         = no_llseek,
 };
 
 static struct miscdevice ep93xx_wdt_miscdev = {