diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-02 13:37:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-02 13:37:41 +0000 |
| commit | e80b89ee2ace3a959c44c834231851fc5242eb13 (patch) | |
| tree | ec8cd7a9cd05002261fbfda9b4ea4f66d1e04f7b /include/linux/hid-sensor-hub.h | |
| parent | 85cfe6b64d785b170367322d9d130a530db7b276 (diff) | |
| parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
Merge tag 'v3.13-rc2' into spi-rcar
Linux 3.13-rc2
Diffstat (limited to 'include/linux/hid-sensor-hub.h')
| -rw-r--r-- | include/linux/hid-sensor-hub.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h index a265af294ea..206a2af6b62 100644 --- a/include/linux/hid-sensor-hub.h +++ b/include/linux/hid-sensor-hub.h @@ -21,6 +21,8 @@ #include <linux/hid.h> #include <linux/hid-sensor-ids.h> +#include <linux/iio/iio.h> +#include <linux/iio/trigger.h> /** * struct hid_sensor_hub_attribute_info - Attribute info @@ -184,6 +186,7 @@ struct hid_sensor_common { struct platform_device *pdev; unsigned usage_id; bool data_ready; + struct iio_trigger *trigger; struct hid_sensor_hub_attribute_info poll; struct hid_sensor_hub_attribute_info report_state; struct hid_sensor_hub_attribute_info power_state; |