Date: Fri, 17 Sep 2004 23:09:21 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 61731 for review Message-ID: <200409172309.i8HN9Lau003634@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/module.h> #include <sys/rman.h> -#include <pci/pcireg.h> -#include <pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/pci/pcivar.h> #include <dev/vga/vga.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200409172309.i8HN9Lau003634>