Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/x86/x86/consinit.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/x86/x86/consinit.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -p -r1.22 -r1.22.2.1
--- src/sys/arch/x86/x86/consinit.c	2011/07/01 18:21:31	1.22
+++ src/sys/arch/x86/x86/consinit.c	2012/04/17 00:07:06	1.22.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: consinit.c,v 1.22 2011/07/01 18:21:31 dyoung Exp $	*/
+/*	$NetBSD: consinit.c,v 1.22.2.1 2012/04/17 00:07:06 yamt Exp $	*/
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.22 2011/07/01 18:21:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.22.2.1 2012/04/17 00:07:06 yamt Exp $");
 
 #include "opt_kgdb.h"
 
@@ -70,13 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
 #include <dev/wsfb/genfbvar.h>
 #endif
 
-#ifdef __i386__
-#include "xboxfb.h"
-#if (NXBOXFB > 0)
-#include <machine/xbox.h>
-#endif
-#endif
-
 #include "com.h"
 #if (NCOM > 0)
 #include <sys/termios.h>
@@ -177,18 +170,6 @@ consinit(void)
 		}
 		genfb_disable();
 #endif
-#if (NXBOXFB > 0)
-		switch (xboxfb_cnattach()) {
-		case 0:
-			goto dokbd;
-		case 1:
-			break;
-		case -1:
-			/* defer initialization until later */
-			initted = 0;
-			return;
-		}
-#endif
 #if (NVGA > 0)
 		if (!vga_cnattach(x86_bus_space_io, x86_bus_space_mem,
 				  -1, 1))