From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Fri, 17 May 2013 09:04:44 +0000 (+0200)
Subject: console: Disable VGA text console support on cris
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=19f3ee2b9dd17f6d8af2ee00cddbe12054c24aca;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

console: Disable VGA text console support on cris

commit 3535629264e69ddbec0bd44b6f9a119947fbe4e2 upstream.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index d5fa5f3fe6d..eb5b3fc72f1 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -6,7 +6,9 @@ menu "Console display driver support"
 
 config VGA_CONSOLE
 	bool "VGA text console" if EXPERT || !X86
-	depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && !ARM64
+	depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && \
+	    !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \
+	    (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && !ARM64
 	default y
 	help
 	  Saying Y here will allow you to use Linux in text mode through a