From owner-p4-projects@FreeBSD.ORG Fri Aug 1 00:17:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0508A37B404; Fri, 1 Aug 2003 00:17:59 -0700 (PDT) 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 AAB0737B401 for ; Fri, 1 Aug 2003 00:17:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D55643FAF for ; Fri, 1 Aug 2003 00:17:58 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h717Hw0U050764 for ; Fri, 1 Aug 2003 00:17:58 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h717HvGf050761 for perforce@freebsd.org; Fri, 1 Aug 2003 00:17:57 -0700 (PDT) Date: Fri, 1 Aug 2003 00:17:57 -0700 (PDT) Message-Id: <200308010717.h717HvGf050761@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 35322 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, 01 Aug 2003 07:18:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=35322 Change 35322 by marcel@marcel_nfs on 2003/08/01 00:17:16 Further clean the ia64 branch: remove i386 and sparc64 specific changes. Affected files ... .. //depot/projects/ia64/sys/conf/files.i386#41 edit .. //depot/projects/ia64/sys/conf/files.sparc64#32 edit .. //depot/projects/ia64/sys/i386/i386/sio_machdep.c#2 delete .. //depot/projects/ia64/sys/i386/i386/vga_machdep.c#3 delete Differences ... ==== //depot/projects/ia64/sys/conf/files.i386#41 (text+ko) ==== @@ -121,8 +121,9 @@ dev/dgb/dgb.c count dgb dev/ed/if_ed_isa.c optional ed isa dev/fb/fb.c optional fb -dev/fb/fb.c optional vga sc +dev/fb/fb.c optional vga dev/fb/splash.c optional splash +dev/fb/vga.c optional vga dev/fe/if_fe_isa.c optional fe isa dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc @@ -135,6 +136,7 @@ dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_isa.c optional sbni isa dev/sbni/if_sbni_pci.c optional sbni pci +dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/sr/if_sr_isa.c optional sr isa dev/syscons/apm/apm_saver.c optional apm_saver apm @@ -149,10 +151,6 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc -dev/vga/vga.c optional vga -dev/vga/vga_isa.c optional vga isa -dev/vga/vga_pci.c optional vga pci -dev/vga/vga_vid.c optional vga sc geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_mbr.c standard @@ -204,13 +202,11 @@ i386/i386/perfmon.c optional perfmon i386/i386/perfmon.c optional perfmon profiling-routine i386/i386/pmap.c standard -i386/i386/sio_machdep.c optional sio i386/i386/support.s standard i386/i386/swtch.s standard i386/i386/sys_machdep.c standard i386/i386/trap.c standard i386/i386/tsc.c standard -i386/i386/vga_machdep.c optional vga i386/i386/vm86.c standard i386/i386/vm_machdep.c standard i386/ibcs2/ibcs2_errno.c optional ibcs2 @@ -382,6 +378,7 @@ dev/ppc/ppc_puc.c optional ppc puc pci isa/psm.c optional psm isa/syscons_isa.c optional sc +isa/vga_isa.c optional vga kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip libkern/divdi3.c standard ==== //depot/projects/ia64/sys/conf/files.sparc64#32 (text+ko) ==== @@ -16,6 +16,7 @@ dev/ofw/openfirm.c standard dev/ofw/openfirmio.c standard dev/ofw/openpromio.c standard +dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa geom/geom_bsd.c standard geom/geom_bsd_enc.c standard