]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
alpha: VGA_HOSE depends on VGA_CONSOLE
authorMatt Turner <mattst88@gmail.com>
Wed, 2 May 2012 01:28:59 +0000 (21:28 -0400)
committerMatt Turner <mattst88@gmail.com>
Wed, 2 May 2012 19:54:05 +0000 (15:54 -0400)
arch/alpha/kernel/console.c:locate_and_init_vga uses vga_con, causing
build failures if VGA_CONSOLE was not set and MARVEL, TITAN, DP264, or
GENERIC alpha system types were set.

Reported-by: Raúl Porcel <armin76@gentoo.org>
Signed-off-by: Matt Turner <mattst88@gmail.com>
arch/alpha/Kconfig

index 56a4df952fb0f2e68889229133e38b2b34de4716..22e58a99f38b0fd19232ec8fec64249ca429846f 100644 (file)
@@ -477,7 +477,7 @@ config ALPHA_BROKEN_IRQ_MASK
 
 config VGA_HOSE
        bool
-       depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL || ALPHA_TSUNAMI
+       depends on VGA_CONSOLE && (ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL || ALPHA_TSUNAMI)
        default y
        help
          Support VGA on an arbitrary hose; needed for several platforms