X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fia64%2Fdig%2Fsetup.c;fp=arch%2Fia64%2Fdig%2Fsetup.c;h=c9104bfff667cafcc5e15af27b9beae9813f20a3;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=93048b2c16177c87af4bcbcd05af70bde323a869;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/ia64/dig/setup.c b/arch/ia64/dig/setup.c
index 93048b2c1..c9104bfff 100644
--- 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)
+{
 }