diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-04-05 16:57:07 +0300 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-04-05 16:57:07 +0300 |
| commit | c6dc0609062c6110d04c54e24b81b503eeadb2c8 (patch) | |
| tree | c8441197c74e9df8407a00eff2433540924ca5ce /drivers/crypto/caam/intern.h | |
| parent | 796b40c6171456274b02447e1dbbea97456403fe (diff) | |
| parent | 40c98cb57cdbc377456116ad4582c89e329721b0 (diff) | |
| download | linux-c6dc0609062c6110d04c54e24b81b503eeadb2c8.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve conflict between caam changes.
Diffstat (limited to 'drivers/crypto/caam/intern.h')
| -rw-r--r-- | drivers/crypto/caam/intern.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h index c334df638ff6..85b6c5835b8f 100644 --- a/drivers/crypto/caam/intern.h +++ b/drivers/crypto/caam/intern.h @@ -66,7 +66,6 @@ struct caam_drv_private_jr { struct caam_drv_private { struct device *dev; - struct platform_device **jrpdev; /* Alloc'ed array per sub-device */ #ifdef CONFIG_CAAM_QI struct device *qidev; #endif |