Merge tag 'drm-misc-next-2020-02-10' of git://anongit.freedesktop.org/drm/drm-misc...

[platform/kernel/linux-rpi.git] / drivers / video / console / Kconfig

diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 70c10ea..3c01b0d 100644 (file)
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -27,7 +27,7 @@ config VGACON_SOFT_SCROLLBACK
        depends on VGA_CONSOLE
        default n
        help
-         The scrollback buffer of the standard VGA console is located in
+        The scrollback buffer of the standard VGA console is located in
         the VGA RAM.  The size of this RAM is fixed and is quite small.
         If you require a larger scrollback buffer, this can be placed in
         System RAM which is dynamically allocated during initialization.
@@ -84,36 +84,36 @@ config MDA_CONSOLE
          If unsure, say N.
 
 config SGI_NEWPORT_CONSOLE
-        tristate "SGI Newport Console support"
+       tristate "SGI Newport Console support"
        depends on SGI_IP22 && HAS_IOMEM
-        select FONT_SUPPORT
-        help
-          Say Y here if you want the console on the Newport aka XL graphics
-          card of your Indy.  Most people say Y here.
+       select FONT_SUPPORT
+       help
+         Say Y here if you want the console on the Newport aka XL graphics
+         card of your Indy.  Most people say Y here.
 
 config DUMMY_CONSOLE
        bool
        default y
 
 config DUMMY_CONSOLE_COLUMNS
-        int "Initial number of console screen columns"
-        depends on DUMMY_CONSOLE && !ARM
-        default 160 if PARISC
-        default 80
-        help
-          On PA-RISC, the default value is 160, which should fit a 1280x1024
-          monitor.
-          Select 80 if you use a 640x480 resolution by default.
+       int "Initial number of console screen columns"
+       depends on DUMMY_CONSOLE && !ARM
+       default 160 if PARISC
+       default 80
+       help
+         On PA-RISC, the default value is 160, which should fit a 1280x1024
+         monitor.
+         Select 80 if you use a 640x480 resolution by default.
 
 config DUMMY_CONSOLE_ROWS
-        int "Initial number of console screen rows"
-        depends on DUMMY_CONSOLE && !ARM
-        default 64 if PARISC
-        default 25
-        help
-          On PA-RISC, the default value is 64, which should fit a 1280x1024
-          monitor.
-          Select 25 if you use a 640x480 resolution by default.
+       int "Initial number of console screen rows"
+       depends on DUMMY_CONSOLE && !ARM
+       default 64 if PARISC
+       default 25
+       help
+         On PA-RISC, the default value is 64, which should fit a 1280x1024
+         monitor.
+         Select 25 if you use a 640x480 resolution by default.
 
 config FRAMEBUFFER_CONSOLE
        bool "Framebuffer Console support"
@@ -129,11 +129,11 @@ config FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
        depends on FRAMEBUFFER_CONSOLE
        default n
        ---help---
-         If this option is selected, the framebuffer console will
-         automatically select the primary display device (if the architecture
+        If this option is selected, the framebuffer console will
+        automatically select the primary display device (if the architecture
         supports this feature).  Otherwise, the framebuffer console will
-         always select the first framebuffer driver that is loaded. The latter
-         is the default behavior.
+        always select the first framebuffer driver that is loaded. The latter
+        is the default behavior.
 
         You can always override the automatic selection of the primary device
         by using the fbcon=map: boot option.
@@ -144,11 +144,11 @@ config FRAMEBUFFER_CONSOLE_ROTATION
        bool "Framebuffer Console Rotation"
        depends on FRAMEBUFFER_CONSOLE
        help
-         Enable display rotation for the framebuffer console.  This is done
-         in software and may be significantly slower than a normally oriented
-         display.  Note that the rotation is done at the console level only
-         such that other users of the framebuffer will remain normally
-         oriented.
+        Enable display rotation for the framebuffer console.  This is done
+        in software and may be significantly slower than a normally oriented
+        display.  Note that the rotation is done at the console level only
+        such that other users of the framebuffer will remain normally
+        oriented.
 
 config FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER
        bool "Framebuffer Console Deferred Takeover"
@@ -162,14 +162,14 @@ config FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER
          black screen as soon as fbcon loads.
 
 config STI_CONSOLE
-        bool "STI text console"
+       bool "STI text console"
        depends on PARISC && HAS_IOMEM
-        select FONT_SUPPORT
-        default y
-        help
-          The STI console is the builtin display/keyboard on HP-PARISC
-          machines.  Say Y here to build support for it into your kernel.
-          The alternative is to use your primary serial port as a console.
+       select FONT_SUPPORT
+       default y
+       help
+         The STI console is the builtin display/keyboard on HP-PARISC
+         machines.  Say Y here to build support for it into your kernel.
+         The alternative is to use your primary serial port as a console.
 
 endmenu