diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-29 21:24:13 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-29 21:24:13 +0100 |
commit | 651c3293bf333c774f3d4c9876a6552d0ac2f5b9 (patch) | |
tree | 5c6239513eae9a083e009182836eff6c494ba067 /drivers/acpi | |
parent | 4f2f2777892fdfe5f6999ae6b882ba5c0fa4bd60 (diff) | |
parent | 7d0b93499f4879ddbc75d594f4ea216ba964f78e (diff) | |
download | talos-obmc-linux-651c3293bf333c774f3d4c9876a6552d0ac2f5b9.tar.gz talos-obmc-linux-651c3293bf333c774f3d4c9876a6552d0ac2f5b9.zip |
Merge branch 'acpi-video'
* acpi-video:
ACPI / video: Add some Samsung models to disable_native_backlight list
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/video.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 1eaadff2e198..c72e79d2c5ad 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -505,6 +505,23 @@ static struct dmi_system_id video_dmi_table[] __initdata = { DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY 15 Notebook PC"), }, }, + + { + .callback = video_disable_native_backlight, + .ident = "SAMSUNG 870Z5E/880Z5E/680Z5E", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), + DMI_MATCH(DMI_PRODUCT_NAME, "870Z5E/880Z5E/680Z5E"), + }, + }, + { + .callback = video_disable_native_backlight, + .ident = "SAMSUNG 370R4E/370R4V/370R5E/3570RE/370R5V", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), + DMI_MATCH(DMI_PRODUCT_NAME, "370R4E/370R4V/370R5E/3570RE/370R5V"), + }, + }, {} }; |