summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-03-24 14:11:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-24 14:11:36 -0700
commite8fe23ffc9bb43cbaade86dfb0701fb35b785d06 (patch)
treebff698de55b400dc90723d931ca1cfdcd9649248 /include/linux
parent213e4eb2da7e4fa716560b20752b05b80b5b0da9 (diff)
parent8c75704ebcac2ffa31ee7bcc359baf701b52bf00 (diff)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: "This fixes regressions in the crypto ccp driver and the hwrng drivers for amd and geode" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: hwrng: geode - Revert managed API changes hwrng: amd - Revert managed API changes crypto: ccp - Assign DMA commands to the channel's CCP
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ccp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ccp.h b/include/linux/ccp.h
index c71dd8fa5764..c41b8d99dd0e 100644
--- a/include/linux/ccp.h
+++ b/include/linux/ccp.h
@@ -556,7 +556,7 @@ enum ccp_engine {
* struct ccp_cmd - CCP operation request
* @entry: list element (ccp driver use only)
* @work: work element used for callbacks (ccp driver use only)
- * @ccp: CCP device to be run on (ccp driver use only)
+ * @ccp: CCP device to be run on
* @ret: operation return code (ccp driver use only)
* @flags: cmd processing flags
* @engine: CCP operation to perform