Skip to content

Commit ec3041b

Browse files
committed
Merge tag 'counter-fixes-for-6.5a' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-linus
William writes: First set of Counter fixes for 6.5 In commit d428487 ("counter: i8254: Introduce the Intel 8254 interface library module"), the misplacement of the I8254 Kconfig entry results in the "Counter support" submenu items disappearing in menuconfig. A fix is provided to reposition the I8254 Kconfig entry to restore the intended submenu behavior. * tag 'counter-fixes-for-6.5a' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter: counter: Fix menuconfig "Counter support" submenu entries disappearance
2 parents 5d0c230 + 9b53a13 commit ec3041b

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/counter/Kconfig

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
# Counter devices
44
#
55

6-
menuconfig COUNTER
7-
tristate "Counter support"
8-
help
9-
This enables counter device support through the Generic Counter
10-
interface. You only need to enable this, if you also want to enable
11-
one or more of the counter device drivers below.
12-
136
config I8254
147
tristate
158
select COUNTER
@@ -25,6 +18,13 @@ config I8254
2518

2619
If built as a module its name will be i8254.
2720

21+
menuconfig COUNTER
22+
tristate "Counter support"
23+
help
24+
This enables counter device support through the Generic Counter
25+
interface. You only need to enable this, if you also want to enable
26+
one or more of the counter device drivers below.
27+
2828
if COUNTER
2929

3030
config 104_QUAD_8

0 commit comments

Comments
 (0)