Keep all of the Remote Controller and CEC menu entries grouped together. This is most relevant to 'make xconfig', where the entries for "HDMI CEC RC integration" and "Enable CEC error injection support" are not displayed (presented) anywhere near the other Remote Controller support options. By grouping all of these menu entries inside a menu/endmenu block, they are forced to be kept together. Fixes: 46d2a3b964dd ("media: place CEC menu before MEDIA_SUPPORT") Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Cc: Sean Young <sean@xxxxxxxx> Cc: Hans Verkuil <hverkuil-cisco@xxxxxxxxx> Cc: linux-media@xxxxxxxxxxxxxxx Cc: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> --- drivers/media/Kconfig | 2 ++ 1 file changed, 2 insertions(+) --- linux-next-20210820.orig/drivers/media/Kconfig +++ linux-next-20210820/drivers/media/Kconfig @@ -6,8 +6,10 @@ # # NOTE: CEC and Remote Controller support should not depend on MEDIA_SUPPORT # +menu "Remote Controller and CEC support" source "drivers/media/rc/Kconfig" source "drivers/media/cec/Kconfig" +endmenu menuconfig MEDIA_SUPPORT tristate "Multimedia support"