diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-20 08:34:47 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-20 08:34:47 +0200 |
commit | 2399cde86e0f6bdbf26cadb83897f6d270921740 (patch) | |
tree | 47afcd9d7e051a4d8f847abd2bb09ab7a18fe1ba /include | |
parent | b4b6cc10c6c8b665cea241835b0ae52d224b8657 (diff) | |
parent | 7904cdf1397c9391178ce53a7ebfa099c6bc4a59 (diff) | |
download | lwn-2399cde86e0f6bdbf26cadb83897f6d270921740.tar.gz lwn-2399cde86e0f6bdbf26cadb83897f6d270921740.zip |
Merge tag 'counter-updates-for-6.7a' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-next
William writes:
First set of Counter updates for the 6.7 cycle
A minor typographical error is fixed in the description comment block
for struct counter_component.
* tag 'counter-updates-for-6.7a' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter:
counter: chrdev: remove a typo in header file comment
Diffstat (limited to 'include')
-rw-r--r-- | include/uapi/linux/counter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/counter.h b/include/uapi/linux/counter.h index fc248ef00e86..008a691c254b 100644 --- a/include/uapi/linux/counter.h +++ b/include/uapi/linux/counter.h @@ -38,7 +38,7 @@ enum counter_scope { * * For example, if the Count 2 ceiling extension of Counter device 4 is desired, * set type equal to COUNTER_COMPONENT_EXTENSION, scope equal to - * COUNTER_COUNT_SCOPE, parent equal to 2, and id equal to the value provided by + * COUNTER_SCOPE_COUNT, parent equal to 2, and id equal to the value provided by * the respective /sys/bus/counter/devices/counter4/count2/ceiling_component_id * sysfs attribute. */ |