From 8cd528920529421a91ee6aacd13c7c8323894a05 Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Fri, 20 Jul 2007 21:47:55 +0000
Subject: [PATCH] --- yaml --- r: 63504 b: refs/heads/master c:
 f1a08cc9a1a8f1da79ca751469ecff82be110482 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/char/watchdog/davinci_wdt.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 31ad975361f3..44846c9d7265 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de81225a8719494f5149980ea8a50de28da653f6
+refs/heads/master: f1a08cc9a1a8f1da79ca751469ecff82be110482
diff --git a/trunk/drivers/char/watchdog/davinci_wdt.c b/trunk/drivers/char/watchdog/davinci_wdt.c
index 27b4f66c000b..19db5302ba6e 100644
--- a/trunk/drivers/char/watchdog/davinci_wdt.c
+++ b/trunk/drivers/char/watchdog/davinci_wdt.c
@@ -132,10 +132,6 @@ static ssize_t
 davinci_wdt_write(struct file *file, const char *data, size_t len,
 		  loff_t *ppos)
 {
-	/*  Can't seek (pwrite) on this device  */
-	if (ppos != &file->f_pos)
-		return -ESPIPE;
-
 	if (len)
 		wdt_service();
 
@@ -143,7 +139,7 @@ davinci_wdt_write(struct file *file, const char *data, size_t len,
 }
 
 static struct watchdog_info ident = {
-	.options = WDIOF_CARDRESET | WDIOF_KEEPALIVEPING,
+	.options = WDIOF_KEEPALIVEPING,
 	.identity = "DaVinci Watchdog",
 };
 
@@ -160,6 +156,7 @@ davinci_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 		break;
 
 	case WDIOC_GETSTATUS:
+	case WDIOC_GETBOOTSTATUS:
 		ret = put_user(0, (int *)arg);
 		break;