diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-23 03:10:12 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-23 03:10:12 +0100 |
| commit | 94000cc32988a0674923309d35ab9c2405c4b39b (patch) | |
| tree | ef9d58ea9ad614bfdf6d0c7c6293f05dbd989475 /drivers/crypto/ccp/ccp-dev.h | |
| parent | Merge tag 'drm-tinydrm-2017-02-18' of https://github.com/notro/linux into drm... (diff) | |
| parent | Linux 4.10-rc8 (diff) | |
| download | linux-94000cc32988a0674923309d35ab9c2405c4b39b.tar.xz linux-94000cc32988a0674923309d35ab9c2405c4b39b.zip | |
Merge tag 'v4.10-rc8' into drm-next
Linux 4.10-rc8
Backmerge Linus rc8 to fix some conflicts, but also
to avoid pulling it in via a fixes pull from someone.
Diffstat (limited to 'drivers/crypto/ccp/ccp-dev.h')
| -rw-r--r-- | drivers/crypto/ccp/ccp-dev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/ccp/ccp-dev.h b/drivers/crypto/ccp/ccp-dev.h index 830f35e6005f..649e5610a5ce 100644 --- a/drivers/crypto/ccp/ccp-dev.h +++ b/drivers/crypto/ccp/ccp-dev.h @@ -238,6 +238,7 @@ struct ccp_dma_chan { struct ccp_device *ccp; spinlock_t lock; + struct list_head created; struct list_head pending; struct list_head active; struct list_head complete; |