diff options
| author |   Matt Turner <mattst88@gmail.com> | 2012-05-01 21:28:59 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2012-05-02 15:54:05 -0400 |
| commit | dd7f1fe1fbe14cb100de14e6aa26ce4d3be0fab9 (patch) | |
| tree | 7b3cb0450d4bfb0e111f667e7a0ed0e4e2d4eed0 /arch | |
| parent | Merge tag 'nfs-for-3.4-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| download | linux-dev-dd7f1fe1fbe14cb100de14e6aa26ce4d3be0fab9.tar.xz linux-dev-dd7f1fe1fbe14cb100de14e6aa26ce4d3be0fab9.zip | |
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')
| -rw-r--r-- | arch/alpha/Kconfig | 2 |
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 |