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 <[EMAIL PROTECTED]> --- On Tue, Jun 03, 2008 at 04:48:30PM -0700, Andrew Morton wrote: > On Mon, 2 Jun 2008 21:37:26 +0400 > Anton Vorontsov <[EMAIL PROTECTED]> wrote: > > > No comments on the previous version for two weeks... resending once > > again. > > I did all the rework to make the patches apply on top of all the > pending watchdog work in Wim's tree and in -mm. I haven't build tested > it yet. Well, only one hunk is mis-merged, in mpc8xxx_wdt-various-renames-mostly-s-mpc83xx-mpc8xxx-g.patch. Here is the patch to fix it. I also run-time tested it, everything seem to work great. p.s. Would be very handy if linux-trees.git would track mmotm snapshots. 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 8b82b91..3c5ed9e 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; -- 1.5.5.1 _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev