These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / platform / x86 / asus-laptop.c

diff --git a/kernel/drivers/platform/x86/asus-laptop.c b/kernel/drivers/platform/x86/asus-laptop.c
index 46b2746..f2b5d0a 100644 (file)
--- a/kernel/drivers/platform/x86/asus-laptop.c
+++ b/kernel/drivers/platform/x86/asus-laptop.c
@@ -54,6 +54,7 @@
 #include <linux/slab.h>
 #include <linux/dmi.h>
 #include <linux/acpi.h>
+#include <acpi/video.h>
 
 #define ASUS_LAPTOP_VERSION    "0.42"
 
@@ -331,6 +332,7 @@ static const struct key_entry asus_keymap[] = {
        {KE_KEY, 0x65, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + TV */
        {KE_KEY, 0x66, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + TV */
        {KE_KEY, 0x67, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + TV */
+       {KE_KEY, 0x6A, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad Fn + F9 */
        {KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad */
        {KE_KEY, 0x6C, { KEY_SLEEP } }, /* Suspend */
        {KE_KEY, 0x6D, { KEY_SLEEP } }, /* Hibernate */
@@ -1884,12 +1886,11 @@ static int asus_acpi_add(struct acpi_device *device)
        if (result)
                goto fail_platform;
 
-       if (!acpi_video_backlight_support()) {
+       if (acpi_video_get_backlight_type() == acpi_backlight_vendor) {
                result = asus_backlight_init(asus);
                if (result)
                        goto fail_backlight;
-       } else
-               pr_info("Backlight controlled by ACPI video driver\n");
+       }
 
        result = asus_input_init(asus);
        if (result)