aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/console
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2018-08-10 17:23:01 +0200
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2018-08-10 17:23:01 +0200
commit15f4c357f909d5fbde43b36e137756d5c654a59d (patch)
treebf1fe38a9877e9607e59ff09e4ab91f119531d54 /drivers/video/console
parentfbdev: omap2: omapfb: fix ifnullfree.cocci warnings (diff)
downloadlinux-dev-15f4c357f909d5fbde43b36e137756d5c654a59d.tar.xz
linux-dev-15f4c357f909d5fbde43b36e137756d5c654a59d.zip
fbcon: Only allow FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER if fbdev is builtin
Having FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER with fbdev+fbcon being build as a module does not make much sense. Having FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER only when fbdev+fbcon are builtin was always the intention, hence the =y checks but they were checking the wrong option, fbcon is build as part of fb.ko, so we must check for FB=y. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to 'drivers/video/console')
-rw-r--r--drivers/video/console/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index e91edef98633..787792c3d08d 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -152,7 +152,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION
config FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER
bool "Framebuffer Console Deferred Takeover"
- depends on FRAMEBUFFER_CONSOLE=y && DUMMY_CONSOLE=y
+ depends on FB=y && FRAMEBUFFER_CONSOLE && DUMMY_CONSOLE
help
If enabled this defers the framebuffer console taking over the
console from the dummy console until the first text is displayed on