diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2008-07-03 23:51:36 -0700 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2008-08-06 13:07:32 +0000 |
| commit | cb55d282a0d2156e7d40ee81726ab16b569e96d7 (patch) | |
| tree | a5490a35bc099618ad8adedb98bf97242b77f556 /drivers/watchdog | |
| parent | 59ca1b0d14ca71bdefef372ccd5035341e0ca091 (diff) | |
| download | kernel-crypto-cb55d282a0d2156e7d40ee81726ab16b569e96d7.tar.gz kernel-crypto-cb55d282a0d2156e7d40ee81726ab16b569e96d7.tar.xz kernel-crypto-cb55d282a0d2156e7d40ee81726ab16b569e96d7.zip | |
[WATCHDOG] mpc8xxx_wdt: fix build
CC drivers/watchdog/mpc8xxx_wdt.o
drivers/watchdog/mpc8xxx_wdt.c: In function 'mpc8xxx_wdt_ioctl':
drivers/watchdog/mpc8xxx_wdt.c:156: error: 'cmd' undeclared (first use in this function)
drivers/watchdog/mpc8xxx_wdt.c:156: error: (Each undeclared identifier is reported only once
drivers/watchdog/mpc8xxx_wdt.c:156: error: for each function it appears in.)
drivers/watchdog/mpc8xxx_wdt.c: At top level:
drivers/watchdog/mpc8xxx_wdt.c:176: warning: initialization from incompatible pointer type
This patch ought to be folded into
mpc8xxx_wdt-various-renames-mostly-s-mpc83xx-mpc8xxx-g.patch
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/mpc8xxx_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index 8b82b91caee..3c5ed9e2622 100644 --- a/drivers/watchdog/mpc8xxx_wdt.c +++ b/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; |