diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-30 12:38:53 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-30 12:38:53 +0000 |
commit | 34f653345018c42cedea89b7f6a4aba3783ebd7b (patch) | |
tree | 663f490f3e16571516dbcce7a2cb2f2545f79dee /drivers/crypto/caam/jr.h | |
parent | 3b58ee13da7510115b66f71c67c9e87b47e9c4aa (diff) | |
parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
download | linux-34f653345018c42cedea89b7f6a4aba3783ebd7b.tar.gz |
Merge tag 'v3.13-rc4' into regmap-core
Needed as a subsequent patch is built on some of the fixes.
Linux 3.13-rc4
Diffstat (limited to 'drivers/crypto/caam/jr.h')
-rw-r--r-- | drivers/crypto/caam/jr.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/crypto/caam/jr.h b/drivers/crypto/caam/jr.h index 9d8741a59037..97113a6d6c58 100644 --- a/drivers/crypto/caam/jr.h +++ b/drivers/crypto/caam/jr.h @@ -8,12 +8,11 @@ #define JR_H /* Prototypes for backend-level services exposed to APIs */ +struct device *caam_jr_alloc(void); +void caam_jr_free(struct device *rdev); int caam_jr_enqueue(struct device *dev, u32 *desc, void (*cbk)(struct device *dev, u32 *desc, u32 status, void *areq), void *areq); -extern int caam_jr_probe(struct platform_device *pdev, struct device_node *np, - int ring); -extern int caam_jr_shutdown(struct device *dev); #endif /* JR_H */ |