Merge master.kernel.org:/home/rmk/linux-2.6-arm

1 files changed, 0 insertions, 4 deletions

diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c
index 9defcf861b67..b4d843489881 100644
--- a/drivers/char/watchdog/mpcore_wdt.c
+++ b/drivers/char/watchdog/mpcore_wdt.c
@@ -180,10 +180,6 @@ static ssize_t mpcore_wdt_write(struct file *file, const char *data, size_t len,
 {
         struct mpcore_wdt *wdt = file->private_data;
 
-        /*  Can't seek (pwrite) on this device  */
-        if (ppos != &file->f_pos)
-                return -ESPIPE;
-
         /*
          *      Refresh the timer.
          */