From 435b589528ad4c88cba16aae5a9dd2ae7f16ba66 Mon Sep 17 00:00:00 2001
From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com>
Date: Tue, 31 May 2011 14:20:11 +0800
Subject: [PATCH] --- yaml --- r: 254813 b: refs/heads/master c:
 ae821c1b2fff22a5b6002e093126156a6d7c8b7b h: refs/heads/master i:   254811:
 7682376a2fb2948636ec4c765fee4933275ea2be v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/platform/x86/acer-wmi.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cb701bc57d89..bb19e55b6731 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92530664bbe5a13aede4a8763459bbe560ad9221
+refs/heads/master: ae821c1b2fff22a5b6002e093126156a6d7c8b7b
diff --git a/trunk/drivers/platform/x86/acer-wmi.c b/trunk/drivers/platform/x86/acer-wmi.c
index 942798ca96bc..e1c4938b301b 100644
--- a/trunk/drivers/platform/x86/acer-wmi.c
+++ b/trunk/drivers/platform/x86/acer-wmi.c
@@ -1156,9 +1156,9 @@ static acpi_status wmid3_set_device_status(u32 value, u16 device)
 	struct wmid3_gds_input_param params = {
 		.function_num = 0x1,
 		.hotkey_number = 0x01,
-		.devices = ACER_WMID3_GDS_WIRELESS &
-				ACER_WMID3_GDS_THREEG &
-				ACER_WMID3_GDS_WIMAX &
+		.devices = ACER_WMID3_GDS_WIRELESS |
+				ACER_WMID3_GDS_THREEG |
+				ACER_WMID3_GDS_WIMAX |
 				ACER_WMID3_GDS_BLUETOOTH,
 	};
 	struct acpi_buffer input = {