From owner-p4-projects@FreeBSD.ORG Fri Sep 17 23:09:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67C0F16A4EC; Fri, 17 Sep 2004 23:09:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 216E416A4D2 for ; Fri, 17 Sep 2004 23:09:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F01A143D46 for ; Fri, 17 Sep 2004 23:09:21 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8HN9L2f003637 for ; Fri, 17 Sep 2004 23:09:21 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8HN9Lau003634 for perforce@freebsd.org; Fri, 17 Sep 2004 23:09:21 GMT (envelope-from marcel@freebsd.org) Date: Fri, 17 Sep 2004 23:09:21 GMT Message-Id: <200409172309.i8HN9Lau003634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 61731 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2004 23:09:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=61731 Change 61731 by marcel@marcel_nfs on 2004/09/17 23:08:58 Flush some local diffs. I don't have enough time to work on this right now... Affected files ... .. //depot/projects/tty/sys/conf/files#15 edit .. //depot/projects/tty/sys/conf/files.ia64#11 edit .. //depot/projects/tty/sys/dev/vga/vga_cons.c#4 edit .. //depot/projects/tty/sys/dev/vga/vga_cpu_ia64.c#1 add .. //depot/projects/tty/sys/dev/vga/vga_pci.c#2 edit .. //depot/projects/tty/sys/dev/vtc/vtc_core.c#1 add .. //depot/projects/tty/sys/ia64/ia64/vga_machdep.c#2 delete Differences ... ==== //depot/projects/tty/sys/conf/files#15 (text+ko) ==== @@ -872,6 +872,10 @@ dev/usb/usbdi.c optional usb dev/usb/usbdi_util.c optional usb dev/utopia/utopia.c optional utopia +dev/vga/vga.c optional vga +dev/vga/vga_cons.c optional vga +dev/vga/vga_isa.c optional vga +dev/vga/vga_pci.c optional vga dev/vinum/vinum.c optional vinum dev/vinum/vinumconfig.c optional vinum dev/vinum/vinumdaemon.c optional vinum @@ -886,6 +890,7 @@ dev/vinum/vinumrevive.c optional vinum dev/vinum/vinumstate.c optional vinum dev/vinum/vinumutil.c optional vinum +dev/vtc/vtc_core.c optional vtc dev/vx/if_vx.c optional vx dev/vx/if_vx_eisa.c optional vx eisa dev/vx/if_vx_pci.c optional vx pci ==== //depot/projects/tty/sys/conf/files.ia64#11 (text+ko) ==== @@ -50,6 +50,7 @@ dev/kbd/kbd.c optional ukbd dev/ppc/ppc.c optional ppc isa dev/uart/uart_cpu_ia64.c optional uart +dev/vga/vga_cpu_ia64.c optional vga geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_gpt.c standard ==== //depot/projects/tty/sys/dev/vga/vga_cons.c#4 (text+ko) ==== @@ -58,7 +58,6 @@ bzero(&vga_console, sizeof(vga_console)); - cp->cn_dev = NULL; /* How do we know. */ cp->cn_pri = CN_DEAD; if (vga_get_console(&cd) != 0) ==== //depot/projects/tty/sys/dev/vga/vga_pci.c#2 (text+ko) ==== @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include #include