Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[linux-2.6-microblaze.git] / drivers / hid / wacom_wac.h

diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index 8f16654..8b2d4e5 100644 (file)
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -337,6 +337,7 @@ struct wacom_wac {
        int tool[2];
        int id[2];
        __u64 serial[2];
+       bool probe_complete;
        bool reporting_data;
        struct wacom_features features;
        struct wacom_shared *shared;
@@ -352,6 +353,7 @@ struct wacom_wac {
        int mode_value;
        struct hid_data hid_data;
        bool has_mute_touch_switch;
+       bool is_soft_touch_switch;
        bool has_mode_change;
        bool is_direct_mode;
        bool is_invalid_bt_frame;