diff options
author | Andy Lutomirski <luto@amacapital.net> | 2014-10-17 20:04:30 -0400 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2014-12-04 07:03:55 -0500 |
commit | a707c27cee56bfb234be6d3acbcc7928760f99be (patch) | |
tree | 4a8132204ab808d27992d6bb6694a37c002d6943 | |
parent | 9a417ec0c9d1f7af5394333411fc4d98adb8761b (diff) |
acpi: Remove _OSI(Linux) for ThinkPads
AFAICT the only reason to set _OSI(Linux) on ThinkPads is to get
sensible mute button behavior. Now that the thinkpad_acpi driver
can do this on is own, there is no reason to keep the ACPI
quirk.
Cc: Len Brown <len.brown@intel.com>
Cc: Jerone Young <jerone.young@canonical.com>
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r-- | drivers/acpi/blacklist.c | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index 7556e7c4a055..9b693d54c743 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c | |||
@@ -305,60 +305,6 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { | |||
305 | */ | 305 | */ |
306 | 306 | ||
307 | /* | 307 | /* |
308 | * Lenovo has a mix of systems OSI(Linux) situations | ||
309 | * and thus we can not wildcard the vendor. | ||
310 | * | ||
311 | * _OSI(Linux) helps sound | ||
312 | * DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad R61"), | ||
313 | * DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T61"), | ||
314 | * T400, T500 | ||
315 | * _OSI(Linux) has Linux specific hooks | ||
316 | * DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"), | ||
317 | * _OSI(Linux) is a NOP: | ||
318 | * DMI_MATCH(DMI_PRODUCT_VERSION, "3000 N100"), | ||
319 | * DMI_MATCH(DMI_PRODUCT_VERSION, "LENOVO3000 V100"), | ||
320 | */ | ||
321 | { | ||
322 | .callback = dmi_enable_osi_linux, | ||
323 | .ident = "Lenovo ThinkPad R61", | ||
324 | .matches = { | ||
325 | DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), | ||
326 | DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad R61"), | ||
327 | }, | ||
328 | }, | ||
329 | { | ||
330 | .callback = dmi_enable_osi_linux, | ||
331 | .ident = "Lenovo ThinkPad T61", | ||
332 | .matches = { | ||
333 | DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), | ||
334 | DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T61"), | ||
335 | }, | ||
336 | }, | ||
337 | { | ||
338 | .callback = dmi_enable_osi_linux, | ||
339 | .ident = "Lenovo ThinkPad X61", | ||
340 | .matches = { | ||
341 | DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), | ||
342 | DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"), | ||
343 | }, | ||
344 | }, | ||
345 | { | ||
346 | .callback = dmi_enable_osi_linux, | ||
347 | .ident = "Lenovo ThinkPad T400", | ||
348 | .matches = { | ||
349 | DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), | ||
350 | DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T400"), | ||
351 | }, | ||
352 | }, | ||
353 | { | ||
354 | .callback = dmi_enable_osi_linux, | ||
355 | .ident = "Lenovo ThinkPad T500", | ||
356 | .matches = { | ||
357 | DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), | ||
358 | DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T500"), | ||
359 | }, | ||
360 | }, | ||
361 | /* | ||
362 | * Without this this EEEpc exports a non working WMI interface, with | 308 | * Without this this EEEpc exports a non working WMI interface, with |
363 | * this it exports a working "good old" eeepc_laptop interface, fixing | 309 | * this it exports a working "good old" eeepc_laptop interface, fixing |
364 | * both brightness control, and rfkill not working. | 310 | * both brightness control, and rfkill not working. |