diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /drivers/platform | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/acer-wmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index be2fd6f91639..fb45f5ee8df1 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c | |||
| @@ -973,7 +973,7 @@ static int acer_rfkill_set(void *data, bool blocked) | |||
| 973 | { | 973 | { |
| 974 | acpi_status status; | 974 | acpi_status status; |
| 975 | u32 cap = (unsigned long)data; | 975 | u32 cap = (unsigned long)data; |
| 976 | status = set_u32(!!blocked, cap); | 976 | status = set_u32(!blocked, cap); |
| 977 | if (ACPI_FAILURE(status)) | 977 | if (ACPI_FAILURE(status)) |
| 978 | return -ENODEV; | 978 | return -ENODEV; |
| 979 | return 0; | 979 | return 0; |