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

Merge tag 'counter-fixes-for-6.5a' of... 

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 d4284874 ("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
parents 5d0c230f 9b53a134

drivers/counter/Kconfig

+7 −7
Original line number Diff line number Diff line
@@ -3,13 +3,6 @@ 
# Counter devices

#



menuconfig COUNTER

	tristate "Counter support"

	help

	  This enables counter device support through the Generic Counter

	  interface. You only need to enable this, if you also want to enable

	  one or more of the counter device drivers below.



config I8254

	tristate

	select COUNTER
@@ -25,6 +18,13 @@ config I8254 


	  If built as a module its name will be i8254.



menuconfig COUNTER

	tristate "Counter support"

	help

	  This enables counter device support through the Generic Counter

	  interface. You only need to enable this, if you also want to enable

	  one or more of the counter device drivers below.



if COUNTER



config 104_QUAD_8