diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-17 04:01:34 -0500 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-17 04:01:34 -0500 |
| commit | bb9074ff58fe745e4f244f76209241909c82ec9c (patch) | |
| tree | cf6be00ab88b1e315f6b74a896a370440f677599 /drivers/acpi/proc.c | |
| parent | 4739a9748e1bd7459f22f7e94e7d85710ca83954 (diff) | |
| parent | 156171c71a0dc4bce12b4408bb1591f8fe32dc1a (diff) | |
Merge commit 'v2.6.32-rc7'
Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler
gets a small bug fix and the sysctl tree where I am removing all
sysctl strategy routines.
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) |