diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-09 08:57:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-09 08:57:03 +0200 |
| commit | 813272ed5238b37c81e448b302048e8008570121 (patch) | |
| tree | af458b6cbe80309368c86e09e7544ff39145ac7c /drivers/hid/intel-ish-hid/ishtp-hid.h | |
| parent | de0534df93474f268486c486ea7e01b44a478026 (diff) | |
| parent | 36a21d51725af2ce0700c6ebcb6b9594aac658a6 (diff) | |
Merge 5.14-rc5 into char-misc-next
We need the fixes in here as well, and resolves some merge issues with
the mhi codebase.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid/intel-ish-hid/ishtp-hid.h')
| -rw-r--r-- | drivers/hid/intel-ish-hid/ishtp-hid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/intel-ish-hid/ishtp-hid.h b/drivers/hid/intel-ish-hid/ishtp-hid.h index f88443a7d935..6a5cc11aefd8 100644 --- a/drivers/hid/intel-ish-hid/ishtp-hid.h +++ b/drivers/hid/intel-ish-hid/ishtp-hid.h @@ -135,6 +135,7 @@ struct ishtp_cl_data { int multi_packet_cnt; struct work_struct work; + struct work_struct resume_work; struct ishtp_cl_device *cl_device; }; |