linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / ia64 / dig / setup.c

diff --git a/arch/ia64/dig/setup.c b/arch/ia64/dig/setup.c
index 93048b2..c9104bf 100644 (file)
--- a/arch/ia64/dig/setup.c
+++ b/arch/ia64/dig/setup.c
@@ -8,13 +8,14 @@
  * Copyright (C) 1999 Walt Drummond <drummond@valinux.com>
  * Copyright (C) 1999 Vijay Chander <vijay@engr.sgi.com>
  */
+#include <linux/config.h>
 
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/kdev_t.h>
 #include <linux/string.h>
-#include <linux/screen_info.h>
+#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/timex.h>
 #include <linux/sched.h>
@@ -24,8 +25,6 @@
 #include <asm/machvec.h>
 #include <asm/system.h>
 
-#include <xen/xencons.h>
-
 void __init
 dig_setup (char **cmdline_p)
 {
@@ -69,19 +68,9 @@ dig_setup (char **cmdline_p)
        screen_info.orig_video_mode = 3;        /* XXX fake */
        screen_info.orig_video_isVGA = 1;       /* XXX fake */
        screen_info.orig_video_ega_bx = 3;      /* XXX fake */
-#ifdef CONFIG_XEN
-       if (!is_running_on_xen() || !is_initial_xendomain())
-               return;
+}
 
-       if (xen_start_info->console.dom0.info_size >=
-           sizeof(struct dom0_vga_console_info)) {
-               const struct dom0_vga_console_info *info =
-                       (struct dom0_vga_console_info *)(
-                               (char *)xen_start_info +
-                               xen_start_info->console.dom0.info_off);
-               dom0_init_screen_info(info);
-       }
-       xen_start_info->console.domU.mfn = 0;
-       xen_start_info->console.domU.evtchn = 0;
-#endif
+void __init
+dig_irq_init (void)
+{
 }