[IA64] vga_con doesn't exist without CONFIG_VGA_CONSOLE

Signed-off-by: Simon Horman <horms@verge.net.au>

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index f2450330b7222032c36405dd864b4e4f328e9474..ffe6e6e13808048b7189f3859dead2f615111467 100644 (file)
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -546,10 +546,12 @@ setup_arch (char **cmdline_p)
                        int offset = 0;
 
                        memset(name, 0, sizeof(name));
-                       if (is_initial_xendomain() && conswitchp != &vga_con)
-                               strncpy(name, "ttyS", 4);
-                       else
+#if defined(CONFIG_VGA_CONSOLE)
+                       if (!is_initial_xendomain() || conswitchp == &vga_con)
                                strncpy(name, "tty", 3);
+                       else
+#endif
+                               strncpy(name, "ttyS", 4);
 
                        p = strstr(*cmdline_p, "xencons=");