Commit e42faf55 authored by Matt Turner's avatar Matt Turner

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: default avatarMatt Turner <mattst88@gmail.com>
parent 143c97cc
...@@ -369,6 +369,7 @@ marvel_io7_present(gct6_node *node) ...@@ -369,6 +369,7 @@ marvel_io7_present(gct6_node *node)
static void __init static void __init
marvel_find_console_vga_hose(void) marvel_find_console_vga_hose(void)
{ {
#ifdef CONFIG_VGA_HOSE
u64 *pu64 = (u64 *)((u64)hwrpb + hwrpb->ctbt_offset); u64 *pu64 = (u64 *)((u64)hwrpb + hwrpb->ctbt_offset);
if (pu64[7] == 3) { /* TERM_TYPE == graphics */ if (pu64[7] == 3) { /* TERM_TYPE == graphics */
...@@ -402,6 +403,7 @@ marvel_find_console_vga_hose(void) ...@@ -402,6 +403,7 @@ marvel_find_console_vga_hose(void)
pci_vga_hose = hose; pci_vga_hose = hose;
} }
} }
#endif
} }
gct6_search_struct gct_wanted_node_list[] = { gct6_search_struct gct_wanted_node_list[] = {
......
...@@ -461,6 +461,7 @@ titan_ioremap(unsigned long addr, unsigned long size) ...@@ -461,6 +461,7 @@ titan_ioremap(unsigned long addr, unsigned long size)
unsigned long *ptes; unsigned long *ptes;
unsigned long pfn; unsigned long pfn;
#ifdef CONFIG_VGA_HOSE
/* /*
* Adjust the address and hose, if necessary. * Adjust the address and hose, if necessary.
*/ */
...@@ -468,6 +469,7 @@ titan_ioremap(unsigned long addr, unsigned long size) ...@@ -468,6 +469,7 @@ titan_ioremap(unsigned long addr, unsigned long size)
h = pci_vga_hose->index; h = pci_vga_hose->index;
addr += pci_vga_hose->mem_space->start; addr += pci_vga_hose->mem_space->start;
} }
#endif
/* /*
* Find the hose. * Find the hose.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment