diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-23 08:18:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-23 08:18:17 -0700 |
| commit | 3bd1911b134ce4a669ea6cf531a36440753b0aaa (patch) | |
| tree | 6e82f12a43c01cb344615eb8f4093d6fb83f78b8 /drivers/watchdog/rc32434_wdt.c | |
| parent | 1910e021f2249402c3f103a5a1a15ebda211d1da (diff) | |
| parent | 7275fc8c36dbad3a871f82b1f9f1f524688176ea (diff) | |
| download | op-kernel-dev-3bd1911b134ce4a669ea6cf531a36440753b0aaa.zip op-kernel-dev-3bd1911b134ce4a669ea6cf531a36440753b0aaa.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] unlocked_ioctl changes
[WATCHDOG] wdt285: fix sparse warnings
[WATCHDOG] ibmasr: remove unnecessary spin_unlock()
Diffstat (limited to 'drivers/watchdog/rc32434_wdt.c')
| -rw-r--r-- | drivers/watchdog/rc32434_wdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c index 6756bcb..c9c73b6 100644 --- a/drivers/watchdog/rc32434_wdt.c +++ b/drivers/watchdog/rc32434_wdt.c @@ -182,8 +182,8 @@ static ssize_t rc32434_wdt_write(struct file *file, const char *data, return 0; } -static int rc32434_wdt_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) +static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd, + unsigned long arg) { void __user *argp = (void __user *)arg; int new_timeout; @@ -242,7 +242,7 @@ static struct file_operations rc32434_wdt_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .write = rc32434_wdt_write, - .ioctl = rc32434_wdt_ioctl, + .unlocked_ioctl = rc32434_wdt_ioctl, .open = rc32434_wdt_open, .release = rc32434_wdt_release, }; |
