diff options
| author | David Howells <dhowells@redhat.com> | 2017-11-13 15:36:33 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2017-11-13 15:36:33 +0000 |
| commit | 81445e63e67a1e98b1c2575fa2b406d4289d2754 (patch) | |
| tree | 2d121d1873b3e8ec7b71086c4db2f5cb207a46ec /drivers/s390/net/lcs.h | |
| parent | ede372dcae15d3ba1d3d52ac45be7a27ce31be28 (diff) | |
| parent | b24591e2fcf852ad7ad2ccf745c8220bf378d312 (diff) | |
Merge remote-tracking branch 'tip/timers/core' into afs-next
These AFS patches need the timer_reduce() patch from timers/core.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/s390/net/lcs.h')
| -rw-r--r-- | drivers/s390/net/lcs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h index f94d8f6dd7a8..fbc8b90b1f85 100644 --- a/drivers/s390/net/lcs.h +++ b/drivers/s390/net/lcs.h @@ -276,6 +276,7 @@ struct lcs_reply { void (*callback)(struct lcs_card *, struct lcs_cmd *); wait_queue_head_t wait_q; struct lcs_card *card; + struct timer_list timer; int received; int rc; }; |