diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-03 02:38:13 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-03 02:38:13 -0500 |
| commit | 467832032cc07626880363efa8625719c16c04eb (patch) | |
| tree | ee9a62c04f0b3106e412bc1b2dd1cea5566d5ca7 /drivers/acpi/proc.c | |
| parent | 66d2a5952eab875f1286e04f738ef029afdaf013 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge commit 'v2.6.32' into next
Diffstat (limited to 'drivers/acpi/proc.c')
| -rw-r--r-- | drivers/acpi/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index f8b6f555ba52..d0d25e2e1ced 100644 --- a/drivers/acpi/proc.c +++ b/drivers/acpi/proc.c | |||
| @@ -393,7 +393,7 @@ acpi_system_write_wakeup_device(struct file *file, | |||
| 393 | struct list_head *node, *next; | 393 | struct list_head *node, *next; |
| 394 | char strbuf[5]; | 394 | char strbuf[5]; |
| 395 | char str[5] = ""; | 395 | char str[5] = ""; |
| 396 | int len = count; | 396 | unsigned int len = count; |
| 397 | struct acpi_device *found_dev = NULL; | 397 | struct acpi_device *found_dev = NULL; |
| 398 | 398 | ||
| 399 | if (len > 4) | 399 | if (len > 4) |