From d2e767d90e517c32399e63b8d950575f12689dc2 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Thu, 3 Jul 2008 23:51:36 -0700
Subject: [PATCH] --- yaml --- r: 107862 b: refs/heads/master c:
 cb55d282a0d2156e7d40ee81726ab16b569e96d7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 15f2caab6d53..7f0988b43c49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59ca1b0d14ca71bdefef372ccd5035341e0ca091
+refs/heads/master: cb55d282a0d2156e7d40ee81726ab16b569e96d7
diff --git a/trunk/drivers/watchdog/mpc8xxx_wdt.c b/trunk/drivers/watchdog/mpc8xxx_wdt.c
index 8b82b91caee7..3c5ed9e26226 100644
--- a/trunk/drivers/watchdog/mpc8xxx_wdt.c
+++ b/trunk/drivers/watchdog/mpc8xxx_wdt.c
@@ -142,7 +142,7 @@ static int mpc8xxx_wdt_release(struct inode *inode, struct file *file)
 	return 0;
 }
 
-static long mpc8xxx_wdt_ioctl(struct inode *inode, struct file *file,
+static long mpc8xxx_wdt_ioctl(struct file *file, unsigned int cmd,
 							unsigned long arg)
 {
 	void __user *argp = (void __user *)arg;