diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:10:38 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:10:38 +0100 |
| commit | 6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23 (patch) | |
| tree | 718281e0f03caaf45c3928fab322e60f7631a9bb /include/linux/hid.h | |
| parent | b50b9d3d21e0af1b8bda94d43c569593d45587af (diff) | |
| parent | 7da85fbf1c87d4f73621e0e7666a3387497075a9 (diff) | |
| download | lwn-6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23.tar.gz lwn-6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23.zip | |
Merge branch 'for-4.15/upstream' into for-linus
- cp2112: GPIO error handling and Kconfig fixes from Sébastien Szymanski
- i2c-hid: fixup / quirk for Apollo-Lake based laptops, from Hans de Goede
- Input/Core: add eraser tool support, from Ping Cheng
- small assorted code fixes
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include/linux/hid.h')
| -rw-r--r-- | include/linux/hid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 47dd962d9a7a..d491027a7c22 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -754,6 +754,7 @@ struct hid_driver { * @stop: called on remove * @open: called by input layer on open * @close: called by input layer on close + * @power: request underlying hardware to enter requested power mode * @parse: this method is called only once to parse the device data, * shouldn't allocate anything to not leak memory * @request: send report request to device (e.g. feature report) |