diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-04-28 01:13:03 (GMT) |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-04-28 01:13:03 (GMT) |
| commit | 6f6438975d6a1afb0f0ac18176ede4e667020db0 (patch) | |
| tree | 11b7ee504210dd7ce7bb3318c1aabbf60759c717 /drivers/crypto/qat/qat_common/adf_common_drv.h | |
| parent | 79152e8d085fd64484afd473ef6830b45518acba (diff) | |
| parent | 9e209fcfb804da262e38e5cd2e680c47a41f0f95 (diff) | |
| download | linux-6f6438975d6a1afb0f0ac18176ede4e667020db0.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in the qat adf_init_pf_wq change.
Diffstat (limited to 'drivers/crypto/qat/qat_common/adf_common_drv.h')
| -rw-r--r-- | drivers/crypto/qat/qat_common/adf_common_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/crypto/qat/qat_common/adf_common_drv.h b/drivers/crypto/qat/qat_common/adf_common_drv.h index 557ea36..ff0b37b 100644 --- a/drivers/crypto/qat/qat_common/adf_common_drv.h +++ b/drivers/crypto/qat/qat_common/adf_common_drv.h @@ -146,6 +146,8 @@ int adf_init_aer(void); void adf_exit_aer(void); int adf_init_vf_wq(void); void adf_exit_vf_wq(void); +int adf_init_pf_wq(void); +void adf_exit_pf_wq(void); int adf_init_admin_comms(struct adf_accel_dev *accel_dev); void adf_exit_admin_comms(struct adf_accel_dev *accel_dev); int adf_send_admin_init(struct adf_accel_dev *accel_dev); |