From a4a08875a8b1a37e1b60c8e1e489d9e00fe4fc00 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 29 May 2008 01:43:48 -0700 Subject: [PATCH] --- yaml --- r: 102627 b: refs/heads/master c: 75a9cd524c6bb441c61c85bae7020ce5e8b2e807 h: refs/heads/master i: 102625: b0135a68c7049e75ce566d8d2d37438ff85513cf 102623: 138fea63c182f305a7e9de403bb4fafa51669a18 v: v3 --- [refs] | 2 +- trunk/include/linux/wanrouter.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2ace96717872..f25eb4895986 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb9122b829e960f4e242c04c2b38c12efb37757b +refs/heads/master: 75a9cd524c6bb441c61c85bae7020ce5e8b2e807 diff --git a/trunk/include/linux/wanrouter.h b/trunk/include/linux/wanrouter.h index 3add87465b1f..e0aa39612eba 100644 --- a/trunk/include/linux/wanrouter.h +++ b/trunk/include/linux/wanrouter.h @@ -522,7 +522,7 @@ extern int wanrouter_proc_init(void); extern void wanrouter_proc_cleanup(void); extern int wanrouter_proc_add(struct wan_device *wandev); extern int wanrouter_proc_delete(struct wan_device *wandev); -extern int wanrouter_ioctl( struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); +extern long wanrouter_ioctl(struct file *file, unsigned int cmd, unsigned long arg); /* Public Data */ /* list of registered devices */