lkml.org 
[lkml]   [2010]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/28] asus-laptop: rename wireless_status to wlan_status to avoid confusion
    Date
    Signed-off-by: Corentin Chary <corentincj@iksaif.net>
    ---
    drivers/platform/x86/asus-laptop.c | 10 +++++-----
    1 files changed, 5 insertions(+), 5 deletions(-)
    diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
    index aad6b93..bb8fb45 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))
    --
    1.6.6.1


    \
     
     \ /
      Last update: 2010-02-02 08:57    [from the cache]
    ©2003-2011 Jasper Spaans