diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /drivers/platform | |
| parent | 5a6338db37885af06760d40cad589316e48431e9 (diff) | |
| parent | ffafa60d496f80c250f2ae0340ae94434c0b0b4d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.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; |