Merge branches 'pm-cpuidle', 'pm-sleep' and 'pm-domains'

[linux-block.git] / include / linux / rmi.h

diff --git a/include/linux/rmi.h b/include/linux/rmi.h
index 8ed37f93f3c829349693b6ee0de6076e8f425597..ab7eea01ab4274bfc9efcefcdb0cced6ec34966f 100644 (file)
--- a/include/linux/rmi.h
+++ b/include/linux/rmi.h
@@ -102,15 +102,16 @@ struct rmi_2d_sensor_platform_data {
 };
 
 /**
- * struct rmi_f30_data - overrides defaults for a single F30 GPIOs/LED chip.
+ * struct rmi_gpio_data - overrides defaults for a single F30/F3A GPIOs/LED
+ * chip.
  * @buttonpad - the touchpad is a buttonpad, so enable only the first actual
  * button that is found.
- * @trackstick_buttons - Set when the function 30 is handling the physical
+ * @trackstick_buttons - Set when the function 30 or 3a is handling the physical
  * buttons of the trackstick (as a PS/2 passthrough device).
- * @disable - the touchpad incorrectly reports F30 and it should be ignored.
+ * @disable - the touchpad incorrectly reports F30/F3A and it should be ignored.
  * This is a special case which is due to misconfigured firmware.
  */
-struct rmi_f30_data {
+struct rmi_gpio_data {
        bool buttonpad;
        bool trackstick_buttons;
        bool disable;
@@ -218,7 +219,7 @@ struct rmi_device_platform_data {
        /* function handler pdata */
        struct rmi_2d_sensor_platform_data sensor_pdata;
        struct rmi_f01_power_management power_management;
-       struct rmi_f30_data f30_data;
+       struct rmi_gpio_data gpio_data;
 };
 
 /**