diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
| commit | 16e842a62a8ffcc2e51def6ef9fd6e0926539bc5 (patch) | |
| tree | 2cf6c23ab195e68712bca51351c1d37ed950c55d /drivers/char/watchdog/wdrtas.c | |
| parent | 525352eb6d355bef6adf597252fc6d04f2dbe66c (diff) | |
| parent | 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/char/watchdog/wdrtas.c')
| -rw-r--r-- | drivers/char/watchdog/wdrtas.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/wdrtas.c b/drivers/char/watchdog/wdrtas.c index 619e2ffca33f..dacfe31caccf 100644 --- a/drivers/char/watchdog/wdrtas.c +++ b/drivers/char/watchdog/wdrtas.c | |||
| @@ -320,7 +320,7 @@ static int | |||
| 320 | wdrtas_ioctl(struct inode *inode, struct file *file, | 320 | wdrtas_ioctl(struct inode *inode, struct file *file, |
| 321 | unsigned int cmd, unsigned long arg) | 321 | unsigned int cmd, unsigned long arg) |
| 322 | { | 322 | { |
| 323 | int __user *argp = (void *)arg; | 323 | int __user *argp = (void __user *)arg; |
| 324 | int i; | 324 | int i; |
| 325 | static struct watchdog_info wdinfo = { | 325 | static struct watchdog_info wdinfo = { |
| 326 | .options = WDRTAS_SUPPORTED_MASK, | 326 | .options = WDRTAS_SUPPORTED_MASK, |