diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 05:52:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 05:52:15 -0400 |
| commit | 7393423dd9b5790a3115873be355e9fc862bce8f (patch) | |
| tree | fc83214602c8ce41dc06d5c8e21deada679521f7 /drivers/watchdog/at91rm9200_wdt.c | |
| parent | 8df9676d6402563da91427e8d9f2da8a4598aede (diff) | |
| parent | 1fca25427482387689fa27594c992a961d98768f (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'drivers/watchdog/at91rm9200_wdt.c')
| -rw-r--r-- | drivers/watchdog/at91rm9200_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c index bacd867dd22e..d061f0ad2d20 100644 --- a/drivers/watchdog/at91rm9200_wdt.c +++ b/drivers/watchdog/at91rm9200_wdt.c | |||
| @@ -128,7 +128,7 @@ static struct watchdog_info at91_wdt_info = { | |||
| 128 | /* | 128 | /* |
| 129 | * Handle commands from user-space. | 129 | * Handle commands from user-space. |
| 130 | */ | 130 | */ |
| 131 | static long at91_wdt_ioct(struct file *file, | 131 | static long at91_wdt_ioctl(struct file *file, |
| 132 | unsigned int cmd, unsigned long arg) | 132 | unsigned int cmd, unsigned long arg) |
| 133 | { | 133 | { |
| 134 | void __user *argp = (void __user *)arg; | 134 | void __user *argp = (void __user *)arg; |