diff options
author | Lee, Chun-Yi <joeyli.kernel@gmail.com> | 2012-03-23 12:36:44 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-13 08:14:08 -0700 |
commit | 1802657ecb10d7ca620c3cf642920009d1aa2ec3 (patch) | |
tree | b41cdb934e92f78bc6cd34d60da4eedb2b542850 /drivers/platform/x86/acer-wmi.c | |
parent | fb83b374f23848545068c9258500b92a36d18fe0 (diff) | |
download | kernel_samsung_smdk4412-1802657ecb10d7ca620c3cf642920009d1aa2ec3.zip kernel_samsung_smdk4412-1802657ecb10d7ca620c3cf642920009d1aa2ec3.tar.gz kernel_samsung_smdk4412-1802657ecb10d7ca620c3cf642920009d1aa2ec3.tar.bz2 |
acer-wmi: No wifi rfkill on Sony machines
commit 5719b81988f3c24ff694dc3a37e35b35630a3966 upstream.
The wireless rfkill should charged by sony-laptop but not acer-wmi.
So, add Sony's SNY5001 acpi device to blacklist in acer-wmi.
Tested on Sony Vaio
Cc: Carlos Corbacho <carlos@strangeworlds.co.uk>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Mattia Dongili <malattia@linux.it>
Cc: Dimitris N <ddarlac@gmail.com>
Tested-by: Dimitris N <ddarlac@gmail.com>
Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/x86/acer-wmi.c')
-rw-r--r-- | drivers/platform/x86/acer-wmi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index db9b25a..2080b22 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -689,6 +689,7 @@ static const struct acpi_device_id norfkill_ids[] = { { "VPC2004", 0}, { "IBM0068", 0}, { "LEN0068", 0}, + { "SNY5001", 0}, /* sony-laptop in charge */ { "", 0}, }; |