diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-07 23:14:35 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-07 23:14:35 +0100 |
| commit | 1a14f30b36e5d20a2a1be24888c2158541d97bab (patch) | |
| tree | 790531441ea86f7873d3d2874f33eeb5c1f2e938 /drivers/acpi/video.c | |
| parent | 583bdc59820692eead7868e816d08bee4c55c1c6 (diff) | |
| parent | cdc87c5a30f407ed1ce43d8a22261116873d5ef1 (diff) | |
| download | linux-next-1a14f30b36e5d20a2a1be24888c2158541d97bab.tar.gz | |
Merge branch 'acpi-general'
* acpi-general:
pnpacpi: fix incorrect TEST_ALPHA() test
ACPI / video: ignore BIOS initial backlight value for HP Folio 13-2000
ACPI : do not use Lid and Sleep button for S5 wakeup
Diffstat (limited to 'drivers/acpi/video.c')
| -rw-r--r-- | drivers/acpi/video.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 0230cb6cbb3a..ac9a69cd45f5 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -389,6 +389,12 @@ static int __init video_set_bqc_offset(const struct dmi_system_id *d) return 0; } +static int video_ignore_initial_backlight(const struct dmi_system_id *d) +{ + use_bios_initial_backlight = 0; + return 0; +} + static struct dmi_system_id video_dmi_table[] __initdata = { /* * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121 @@ -433,6 +439,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = { DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7720"), }, }, + { + .callback = video_ignore_initial_backlight, + .ident = "HP Folio 13-2000", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13 - 2000 Notebook PC"), + }, + }, {} }; |