diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-04-29 07:36:43 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-04-29 07:36:43 +0000 |
| commit | e96d52d198511789d66d8fb7bd9a0f3c3c9c0107 (patch) | |
| tree | a91c5c6dbd1ccf52974ba5063918e1c171ebeb1a /target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c | |
| parent | 19be4923e0a2dfa6dd173288fc0ead976a0f2b38 (diff) | |
| download | master-31e0f0ae-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.tar.gz master-31e0f0ae-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.tar.bz2 master-31e0f0ae-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.zip | |
adm5120: merge 3.3 patches
SVN-Revision: 31511
Diffstat (limited to 'target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c')
| -rw-r--r-- | target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c b/target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c index bf90568949..d5d63b27a5 100644 --- a/target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c +++ b/target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c @@ -123,8 +123,7 @@ static ssize_t wdt_write(struct file *file, const char *data, size_t len, loff_t return 0; } -static int wdt_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) +static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { int new_timeout; static struct watchdog_info ident = { @@ -166,7 +165,7 @@ static const struct file_operations wdt_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .write = wdt_write, - .ioctl = wdt_ioctl, + .unlocked_ioctl = wdt_ioctl, .open = wdt_open, .release = wdt_release, }; |