From 551bd2f4e2c00c148ac8ac77026aaa5641758c65 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sun, 14 Oct 2007 19:34:20 +0100
Subject: [PATCH] --- yaml --- r: 68683 b: refs/heads/master c:
 a39f9d028a48c9dfbc98e8c1504bf96578c65164 h: refs/heads/master i:   68681:
 980b24832e2964ea5a371f29d179a480835df820   68679:
 f821a594ac4987ad289c9d8945ce9e21273fd8fd v: v3

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

diff --git a/[refs] b/[refs]
index e08cf8c9fa07..20acac1035bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d966d495c4ac2fcbd010f681425f67141f80bad
+refs/heads/master: a39f9d028a48c9dfbc98e8c1504bf96578c65164
diff --git a/trunk/drivers/char/watchdog/mpc5200_wdt.c b/trunk/drivers/char/watchdog/mpc5200_wdt.c
index 564143d40610..9cfb97576623 100644
--- a/trunk/drivers/char/watchdog/mpc5200_wdt.c
+++ b/trunk/drivers/char/watchdog/mpc5200_wdt.c
@@ -81,7 +81,7 @@ static int mpc5200_wdt_stop(struct mpc5200_wdt *wdt)
 
 
 /* file operations */
-static ssize_t mpc5200_wdt_write(struct file *file, const char *data,
+static ssize_t mpc5200_wdt_write(struct file *file, const char __user *data,
 		size_t len, loff_t *ppos)
 {
 	struct mpc5200_wdt *wdt = file->private_data;