summaryrefslogtreecommitdiff
path: root/drivers/platform
diff options
context:
space:
mode:
authorCorentin Chary <corentincj@iksaif.net>2010-01-17 19:21:13 +0300
committerCorentin Chary <corentincj@iksaif.net>2010-02-28 21:35:12 +0300
commitd0930a2d42c5a28039d8cc2376a7dff4e59c5f7a (patch)
treeadcac1276708032640f72feb83e09acdbd3fc740 /drivers/platform
parente5593bf18be79b4897c7ec8b392dc7f07cbc1b11 (diff)
downloadlinux-d0930a2d42c5a28039d8cc2376a7dff4e59c5f7a.tar.xz
asus-laptop: rename wireless_status to wlan_status to avoid confusion
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/asus-laptop.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index aad6b9300f5d..bb8fb45c45e9 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -76,11 +76,11 @@ static uint wapf = 1;
module_param(wapf, uint, 0644);
MODULE_PARM_DESC(wapf, "WAPF value");
-static uint wireless_status = 1;
+static uint wlan_status = 1;
static uint bluetooth_status = 1;
-module_param(wireless_status, uint, 0644);
-MODULE_PARM_DESC(wireless_status, "Set the wireless status on boot "
+module_param(wlan_status, uint, 0644);
+MODULE_PARM_DESC(wlan_status, "Set the wireless status on boot "
"(0 = disabled, 1 = enabled, -1 = don't do anything). "
"default is 1");
@@ -1446,8 +1446,8 @@ static int __devinit asus_acpi_init(struct asus_laptop *asus)
if (bluetooth_status >= 0)
asus_bluetooth_set(asus, !!bluetooth_status);
- if (wireless_status >= 0)
- asus_wlan_set(asus, !!wireless_status);
+ if (wlan_status >= 0)
+ asus_wlan_set(asus, !!wlan_status);
/* Keyboard Backlight is on by default */
if (!acpi_check_handle(asus->handle, METHOD_KBD_LIGHT_SET, NULL))