diff options
| author | Matt Turner <mattst88@gmail.com> | 2016-10-24 22:07:41 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2017-08-29 12:01:41 -0700 |
| commit | e42faf553c8d7bdd4735cc6b9a9e969aa985d078 (patch) | |
| tree | 544d2d9b78e228c4145113d5d2faa1d9954748f7 /arch/alpha | |
| parent | 143c97cc652949893c8056c679012f0aeccb80e5 (diff) | |
| download | linux-stable-e42faf553c8d7bdd4735cc6b9a9e969aa985d078.tar.gz linux-stable-e42faf553c8d7bdd4735cc6b9a9e969aa985d078.tar.bz2 linux-stable-e42faf553c8d7bdd4735cc6b9a9e969aa985d078.zip | |
alpha: Fix build error without CONFIG_VGA_HOSE.
pci_vga_hose is #defined to 0 in include/asm/vga.h if CONFIG_VGA_HOSE is
not set.
Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/core_marvel.c | 2 | ||||
| -rw-r--r-- | arch/alpha/kernel/core_titan.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c index d5f0580746a5..db72356714c1 100644 --- a/arch/alpha/kernel/core_marvel.c +++ b/arch/alpha/kernel/core_marvel.c @@ -369,6 +369,7 @@ marvel_io7_present(gct6_node *node) static void __init marvel_find_console_vga_hose(void) { +#ifdef CONFIG_VGA_HOSE u64 *pu64 = (u64 *)((u64)hwrpb + hwrpb->ctbt_offset); if (pu64[7] == 3) { /* TERM_TYPE == graphics */ @@ -402,6 +403,7 @@ marvel_find_console_vga_hose(void) pci_vga_hose = hose; } } +#endif } gct6_search_struct gct_wanted_node_list[] = { diff --git a/arch/alpha/kernel/core_titan.c b/arch/alpha/kernel/core_titan.c index 219bf271c0ba..b532d925443d 100644 --- a/arch/alpha/kernel/core_titan.c +++ b/arch/alpha/kernel/core_titan.c @@ -461,6 +461,7 @@ titan_ioremap(unsigned long addr, unsigned long size) unsigned long *ptes; unsigned long pfn; +#ifdef CONFIG_VGA_HOSE /* * Adjust the address and hose, if necessary. */ @@ -468,6 +469,7 @@ titan_ioremap(unsigned long addr, unsigned long size) h = pci_vga_hose->index; addr += pci_vga_hose->mem_space->start; } +#endif /* * Find the hose. |