summaryrefslogtreecommitdiff
path: root/arch/alpha
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2012-05-01 21:28:59 -0400
committerMatt Turner <mattst88@gmail.com>2012-05-02 15:54:05 -0400
commitdd7f1fe1fbe14cb100de14e6aa26ce4d3be0fab9 (patch)
tree7b3cb0450d4bfb0e111f667e7a0ed0e4e2d4eed0 /arch/alpha
parent529acf58981440eefeaf1451387e2a0aa4825c12 (diff)
downloadlinux-dd7f1fe1fbe14cb100de14e6aa26ce4d3be0fab9.tar.gz
alpha: VGA_HOSE depends on VGA_CONSOLE
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>
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 56a4df952fb0..22e58a99f38b 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -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