diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /drivers/acpi/proc.c | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
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) |