]> err.no Git - linux-2.6/commitdiff
[WATCHDOG] mpc8xxx_wdt: fix build
authorAnton Vorontsov <avorontsov@ru.mvista.com>
Fri, 4 Jul 2008 06:51:36 +0000 (23:51 -0700)
committerWim Van Sebroeck <wim@iguana.be>
Wed, 6 Aug 2008 13:07:32 +0000 (13:07 +0000)
  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>
drivers/watchdog/mpc8xxx_wdt.c

index 8b82b91caee7384d3ce2690f324599cf4b38ac3c..3c5ed9e262268b9417f7ad2f0c105e68e66de1d5 100644 (file)
@@ -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;