From owner-p4-projects@FreeBSD.ORG Wed Mar 12 21:28:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBCB81065672; Wed, 12 Mar 2008 21:28:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B3101065685 for ; Wed, 12 Mar 2008 21:28:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 926FC8FC16 for ; Wed, 12 Mar 2008 21:28:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2CLSqM6014811 for ; Wed, 12 Mar 2008 21:28:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2CLSqtc014809 for perforce@freebsd.org; Wed, 12 Mar 2008 21:28:52 GMT (envelope-from sam@freebsd.org) Date: Wed, 12 Mar 2008 21:28:52 GMT Message-Id: <200803122128.m2CLSqtc014809@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 137548 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Mar 2008 21:28:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=137548 Change 137548 by sam@sam_ebb on 2008/03/12 21:28:39 IFC Affected files ... .. //depot/projects/vap/sys/conf/files#23 edit .. //depot/projects/vap/sys/conf/options#14 edit Differences ... ==== //depot/projects/vap/sys/conf/files#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1278 2008/03/06 08:09:44 rink Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1280 2008/03/12 10:11:56 jeff Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1188,6 +1188,7 @@ dev/utopia/utopia.c optional utopia dev/vge/if_vge.c optional vge dev/vkbd/vkbd.c optional vkbd +dev/vr/if_vr.c optional vr pci 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 @@ -1464,7 +1465,6 @@ kern/kern_idle.c standard kern/kern_intr.c standard kern/kern_jail.c standard -kern/kern_kse.c standard kern/kern_kthread.c standard kern/kern_ktr.c optional ktr kern/kern_ktrace.c standard @@ -2062,7 +2062,6 @@ pci/if_sis.c optional sis pci pci/if_ste.c optional ste pci pci/if_tl.c optional tl pci -pci/if_vr.c optional vr pci pci/if_wb.c optional wb pci pci/if_xl.c optional xl pci pci/intpm.c optional intpm pci ==== //depot/projects/vap/sys/conf/options#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.619 2008/03/02 00:52:49 marcel Exp $ +# $FreeBSD: src/sys/conf/options,v 1.620 2008/03/12 10:11:56 jeff Exp $ # # On the handling of kernel options # @@ -104,7 +104,6 @@ GEOM_VIRSTOR opt_geom.h GEOM_VOL opt_geom.h GEOM_ZERO opt_geom.h -KSE opt_global.h KSTACK_MAX_PAGES KSTACK_PAGES KTRACE