diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-12-12 13:25:54 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-12-12 13:25:54 +0100 |
commit | 76523de61993d015f7895d06deacd3fd454574a1 (patch) | |
tree | 7b2890ac9733c55ff73c72bba7b6b5c788ba925b /drivers/media/rc/rc-ir-raw.c | |
parent | uprobes/x86: Emulate push insns for uprobe on x86 (diff) | |
parent | Linux 4.15-rc3 (diff) | |
download | linux-76523de61993d015f7895d06deacd3fd454574a1.tar.xz linux-76523de61993d015f7895d06deacd3fd454574a1.zip |
Merge tag 'v4.15-rc3' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/rc/rc-ir-raw.c')
-rw-r--r-- | drivers/media/rc/rc-ir-raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c index f6e5ba4fbb49..d78483a504c9 100644 --- a/drivers/media/rc/rc-ir-raw.c +++ b/drivers/media/rc/rc-ir-raw.c @@ -128,7 +128,7 @@ EXPORT_SYMBOL_GPL(ir_raw_event_store_edge); /** * ir_raw_event_store_with_filter() - pass next pulse/space to decoders with some processing * @dev: the struct rc_dev device descriptor - * @type: the type of the event that has occurred + * @ev: the event that has occurred * * This routine (which may be called from an interrupt context) works * in similar manner to ir_raw_event_store_edge. |