Commit 2399cde8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'counter-updates-for-6.7a' of... 

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
parents b4b6cc10 7904cdf1

include/uapi/linux/counter.h

+1 −1
Original line number Diff line number Diff line
@@ -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.

 */