diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:13:04 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:13:04 +0200 |
commit | 57c0eabbd57e1a0872122525f6eeefe1f6529c33 (patch) | |
tree | 788d036bfbc9c92fb7663588033f50d2d6f5c828 /include/linux/ccp.h | |
parent | 392910cf3f8a0161d3da45d02ea17f2910d9193b (diff) | |
parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
download | op-kernel-dev-57c0eabbd57e1a0872122525f6eeefe1f6529c33.zip op-kernel-dev-57c0eabbd57e1a0872122525f6eeefe1f6529c33.tar.gz |
Merge 4.11-rc4 into char-misc-next
We want the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/ccp.h')
-rw-r--r-- | include/linux/ccp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ccp.h b/include/linux/ccp.h index c71dd8f..c41b8d99 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 |