Merge branch 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox

[firefly-linux-kernel-4.4.55.git] / include / linux / input-polldev.h

diff --git a/include/linux/input-polldev.h b/include/linux/input-polldev.h
index ce0b72464eb814bf5902e3daf423522934963b8c..2465182670dbe215a297849053ba8921f2709f63 100644 (file)
--- a/include/linux/input-polldev.h
+++ b/include/linux/input-polldev.h
@@ -48,9 +48,12 @@ struct input_polled_dev {
 
 /* private: */
        struct delayed_work work;
+
+       bool devres_managed;
 };
 
 struct input_polled_dev *input_allocate_polled_device(void);
+struct input_polled_dev *devm_input_allocate_polled_device(struct device *dev);
 void input_free_polled_device(struct input_polled_dev *dev);
 int input_register_polled_device(struct input_polled_dev *dev);
 void input_unregister_polled_device(struct input_polled_dev *dev);