Replace CONFIG_VIDEO_CMDLINE and CONFIG_VIDEO_NOMODESET by the single option CONFIG_VIDEO. Select the latter for DRM or fbdev. Both original options used to be selected in most cases, so this change simplifies the Kconfig rules. Since commit ca6c080eef42 ("arch/parisc: Detect primary video device from device instance") architecture helpers for fbdev do not longer require fbdev in their implementation and could be used for non-fbdev code as well. Eventually guarding them with CONFIG_VIDEO will make them available to any subsystem. Thomas Zimmermann (3): video/cmdline: Introduce CONFIG_VIDEO for video= parameter video/cmdline: Hide __video_get_options() behind CONFIG_FB_CORE video/nomodeset: Select nomodeset= parameter with CONFIG_VIDEO drivers/gpu/drm/Kconfig | 3 +-- drivers/staging/sm750fb/Kconfig | 1 - drivers/video/Kconfig | 5 +---- drivers/video/Makefile | 3 +-- drivers/video/cmdline.c | 2 ++ drivers/video/fbdev/Kconfig | 37 ------------------------------- drivers/video/fbdev/core/Kconfig | 2 +- drivers/video/fbdev/core/fbmem.c | 2 -- drivers/video/fbdev/geode/Kconfig | 3 --- include/linux/fb.h | 7 ------ include/video/cmdline.h | 7 +----- 11 files changed, 7 insertions(+), 65 deletions(-) base-commit: 05b317e8457c8e2bd1a797c9440ec07b7f341584 -- 2.43.0