Merge branch 'gup_flag-cleanups'

[cascardo/linux.git] / drivers / platform / x86 / asus-wmi.h

diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h
index 5de1df5..0e19014 100644 (file)
--- a/drivers/platform/x86/asus-wmi.h
+++ b/drivers/platform/x86/asus-wmi.h
@@ -28,6 +28,7 @@
 #define _ASUS_WMI_H_
 
 #include <linux/platform_device.h>
+#include <linux/i8042.h>
 
 #define ASUS_WMI_KEY_IGNORE (-1)
 #define ASUS_WMI_BRN_DOWN      0x20
@@ -43,6 +44,7 @@ struct quirk_entry {
        bool scalar_panel_brightness;
        bool store_backlight_power;
        bool wmi_backlight_power;
+       bool wmi_backlight_native;
        int wapf;
        /*
         * For machines with AMD graphic chips, it will send out WMI event
@@ -51,6 +53,9 @@ struct quirk_entry {
         * and let the ACPI interrupt to send out the key event.
         */
        int no_display_toggle;
+
+       bool (*i8042_filter)(unsigned char data, unsigned char str,
+                            struct serio *serio);
 };
 
 struct asus_wmi_driver {