aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-10-06 21:59:55 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-09 20:25:02 -0400
commit068aab7766cf968a8ddb86a6d7c6bbed9d61e353 (patch)
treec53dd4398cd301c334c5ab48f0da2fb21174b171
parentb4cb9244a544a1623305eb58267a90418268d31e (diff)
ACPI: add missing win8 OSI comment to blacklist
In my original patch[1] I wrote a comment describing the reason for disabling Windows 2012 OSI mode for a group of machines, however, due to unknown reasons (probably a conflict resolution mismatch), the comment was dropped in 94fb982 (ACPI: blacklist win8 OSI for buggy laptops). Since Matthew Garrett is making a big deal out of the lack of comments in a separate patch[2], it might make sense to re-introduce the missing comment so that other patch is not blocked and users don't suffer. [1] http://article.gmane.org/gmane.linux.acpi.devel/63427 [2] http://thread.gmane.org/gmane.linux.kernel/1572459 Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/blacklist.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index f37dec579712..aa4d874a96fd 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -273,6 +273,11 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
273 DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P305D"), 273 DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P305D"),
274 }, 274 },
275 }, 275 },
276
277 /*
278 * The following machines have broken backlight support when reporting
279 * the Windows 2012 OSI, so disable it until their support is fixed.
280 */
276 { 281 {
277 .callback = dmi_disable_osi_win8, 282 .callback = dmi_disable_osi_win8,
278 .ident = "ASUS Zenbook Prime UX31A", 283 .ident = "ASUS Zenbook Prime UX31A",