Skip to content

Commit

Permalink
asus-laptop: rename wireless_status to wlan_status to avoid confusion
Browse files Browse the repository at this point in the history
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
  • Loading branch information
Corentin Chary committed Feb 28, 2010
1 parent e5593bf commit d0930a2
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/platform/x86/asus-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down Expand Up @@ -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))
Expand Down

0 comments on commit d0930a2

Please sign in to comment.